Skip to content
This repository was archived by the owner on Jul 16, 2024. It is now read-only.

Commit c4eb1ff

Browse files
authored
feat: Add job template capability (#542)
* Add job template feature * Remove the check on eksAdminArn
1 parent 7a130b9 commit c4eb1ff

15 files changed

Lines changed: 593 additions & 60 deletions

File tree

core/.projen/tasks.json

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/API.md

Lines changed: 203 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/src/common/pre-bundled-layer.ts

Lines changed: 7 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -21,33 +21,13 @@ export interface PreBundledLayerProps extends Partial<LayerVersionProps>{
2121
* Do not include packages in your Lambda function `requirements.txt` if they are already part of the PreBundledLayer.
2222
*
2323
* Here is the list of bundled dependencies:
24-
* * astroid==2.4.2
25-
* * autopep8==1.6.0
26-
* * backports.entry-points-selectable==1.1.0
27-
* * boto3==1.20.12
28-
* * botocore==1.23.12
29-
* * click==8.0.3
30-
* * distlib==0.3.2
31-
* * filelock==3.0.12
32-
* * Flask==2.0.2
33-
* * isort==5.6.4
34-
* * itsdangerous==2.0.1
35-
* * Jinja2==3.0.2
36-
* * jmespath==0.10.0
37-
* * lazy-object-proxy==1.4.3
38-
* * MarkupSafe==2.0.1
39-
* * mccabe==0.6.1
40-
* * platformdirs==2.2.0
41-
* * pycodestyle==2.8.0
42-
* * pylint==2.6.0
24+
* * boto3==1.26.37
25+
* * botocore==1.29.37
26+
* * jmespath==1.0.1
4327
* * python-dateutil==2.8.2
44-
* * s3transfer==0.5.0
45-
* * six==1.15.0
46-
* * toml==0.10.2
47-
* * urllib3==1.26.7
48-
* * virtualenv==20.7.0
49-
* * Werkzeug==2.0.2
50-
* * wrapt==1.12.1
28+
* * s3transfer==0.6.0
29+
* * six==1.16.0
30+
* * urllib3==1.26.13
5131
*/
5232
export class PreBundledLayer extends LayerVersion {
5333

@@ -65,7 +45,7 @@ export class PreBundledLayer extends LayerVersion {
6545

6646
return boto3Layer || new PreBundledLayer(stack, id, {
6747
codePath: codePath,
68-
compatibleRuntimes: [Runtime.PYTHON_3_6, Runtime.PYTHON_3_8, Runtime.PYTHON_3_7, Runtime.PYTHON_3_9],
48+
compatibleRuntimes: [Runtime.PYTHON_3_8, Runtime.PYTHON_3_7, Runtime.PYTHON_3_9],
6949
layerVersionName: 'ara-boto3-layer',
7050
});
7151
}
Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,7 @@
1-
astroid==2.4.2
2-
autopep8==1.6.0
3-
backports.entry-points-selectable==1.1.0
4-
boto3==1.20.12
5-
botocore==1.23.12
6-
click==8.0.3
7-
distlib==0.3.2
8-
filelock==3.0.12
9-
Flask==2.0.2
10-
isort==5.6.4
11-
itsdangerous==2.0.1
12-
Jinja2==3.0.2
13-
jmespath==0.10.0
14-
lazy-object-proxy==1.4.3
15-
MarkupSafe==2.0.1
16-
mccabe==0.6.1
17-
platformdirs==2.2.0
18-
pycodestyle==2.8.0
19-
pylint==2.6.0
1+
boto3==1.26.37
2+
botocore==1.29.37
3+
jmespath==1.0.1
204
python-dateutil==2.8.2
21-
s3transfer==0.5.0
22-
six==1.15.0
23-
toml==0.10.2
24-
urllib3==1.26.7
25-
virtualenv==20.7.0
26-
Werkzeug==2.0.2
27-
wrapt==1.12.1
5+
s3transfer==0.6.0
6+
six==1.16.0
7+
urllib3==1.26.13

core/src/emr-eks-platform/emr-eks-cluster-helpers.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,13 @@ import * as IamPolicyAlb from './resources/k8s/iam-policy-alb.json';
2222
* @param {Construct} scope The local path of the yaml podTemplate files to upload
2323
* @param {string} eksAdminRoleArn The admin role of the EKS cluster
2424
*/
25-
export function eksClusterSetup(cluster: EmrEksCluster, scope: Construct, eksAdminRoleArn: string) {
25+
export function eksClusterSetup(cluster: EmrEksCluster, scope: Construct, eksAdminRoleArn?: string) {
26+
2627

2728
// Add the provided Amazon IAM Role as Amazon EKS Admin
28-
cluster.eksCluster.awsAuth.addMastersRole(Role.fromRoleArn( scope, 'AdminRole', eksAdminRoleArn ), 'AdminRole');
29+
if (eksAdminRoleArn != undefined){
30+
cluster.eksCluster.awsAuth.addMastersRole(Role.fromRoleArn( scope, 'AdminRole', eksAdminRoleArn ), 'AdminRole');
31+
}
2932

3033
// Deploy the Helm Chart for the Certificate Manager. Required for EMR Studio ALB.
3134
const certManager = cluster.eksCluster.addHelmChart('CertManager', {

0 commit comments

Comments
 (0)