Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(eks): kubectl 1.16.8-eks-e16311, aws-cli 1.18.86, helm 3.2.4 #8739

Merged
merged 11 commits into from
Jun 29, 2020
Merged

chore(eks): kubectl 1.16.8-eks-e16311, aws-cli 1.18.86, helm 3.2.4 #8739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a136fba
bump aws-lambda-layer-kubectl to 2.0.0
pahud Jun 24, 2020
d992e95
support aws-lambda-layer-kubectl 2.0.0
pahud Jun 25, 2020
d70a9e7
minor fix
pahud Jun 25, 2020
fe8ecaa
minor fix
pahud Jun 25, 2020
b92defc
fix
pahud Jun 28, 2020
bf31cd1
fix
pahud Jun 28, 2020
6bff0c6
Merge branch 'master' into eks-kubectl-layer-2.0.0
pahud Jun 28, 2020
0695277
Merge branch 'master' into eks-kubectl-layer-2.0.0
pahud Jun 29, 2020
8a81821
Merge branch 'master' into eks-kubectl-layer-2.0.0
pahud Jun 29, 2020
dbfeaf5
update integ
pahud Jun 29, 2020
ff0209f
Merge branch 'master' into eks-kubectl-layer-2.0.0
pahud Jun 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-eks/lib/kubectl-provider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export class KubectlProvider extends NestedStack {
runtime: lambda.Runtime.PYTHON_3_7,
handler: 'index.handler',
timeout: Duration.minutes(15),
layers: [ KubectlLayer.getOrCreate(this, { version: '2.0.0-beta2' }) ],
layers: [ KubectlLayer.getOrCreate(this, { version: '2.0.0' }) ],
memorySize: 256,
});

Expand Down
20 changes: 10 additions & 10 deletions packages/@aws-cdk/aws-eks/test/integ.eks-cluster.expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2456,7 +2456,7 @@
"Chart": "kubernetes-dashboard",
"Wait": false,
"Namespace": "default",
"Repository": "https://kubernetes-charts.storage.googleapis.com"
"Repository": "https://kubernetes.github.io/dashboard/"
},
"UpdateReplacePolicy": "Delete",
"DeletionPolicy": "Delete"
Expand Down Expand Up @@ -2687,7 +2687,7 @@
},
"/",
{
"Ref": "AssetParametersc70286a3d87ecc95aea2ffe7d7723ba303222280fb87f0128b3e83dcdd1d649eS3Bucket5515EF97"
"Ref": "AssetParameters5b580ce3f53b1ee1551ac2e759433f10ef9a6a312bf7a501a0753fddcc8a3042S3BucketAE64A22C"
},
"/",
{
Expand All @@ -2697,7 +2697,7 @@
"Fn::Split": [
"||",
{
"Ref": "AssetParametersc70286a3d87ecc95aea2ffe7d7723ba303222280fb87f0128b3e83dcdd1d649eS3VersionKeyF1C97F67"
"Ref": "AssetParameters5b580ce3f53b1ee1551ac2e759433f10ef9a6a312bf7a501a0753fddcc8a3042S3VersionKeyAFF70CF1"
}
]
}
Expand All @@ -2710,7 +2710,7 @@
"Fn::Split": [
"||",
{
"Ref": "AssetParametersc70286a3d87ecc95aea2ffe7d7723ba303222280fb87f0128b3e83dcdd1d649eS3VersionKeyF1C97F67"
"Ref": "AssetParameters5b580ce3f53b1ee1551ac2e759433f10ef9a6a312bf7a501a0753fddcc8a3042S3VersionKeyAFF70CF1"
}
]
}
Expand Down Expand Up @@ -3073,17 +3073,17 @@
"Type": "String",
"Description": "Artifact hash for asset \"7255958d303a278986617e8d7ce027c96cd00a70fb8f1ca02c1e0da94a571896\""
},
"AssetParametersc70286a3d87ecc95aea2ffe7d7723ba303222280fb87f0128b3e83dcdd1d649eS3Bucket5515EF97": {
"AssetParameters5b580ce3f53b1ee1551ac2e759433f10ef9a6a312bf7a501a0753fddcc8a3042S3BucketAE64A22C": {
"Type": "String",
"Description": "S3 bucket for asset \"c70286a3d87ecc95aea2ffe7d7723ba303222280fb87f0128b3e83dcdd1d649e\""
"Description": "S3 bucket for asset \"5b580ce3f53b1ee1551ac2e759433f10ef9a6a312bf7a501a0753fddcc8a3042\""
},
"AssetParametersc70286a3d87ecc95aea2ffe7d7723ba303222280fb87f0128b3e83dcdd1d649eS3VersionKeyF1C97F67": {
"AssetParameters5b580ce3f53b1ee1551ac2e759433f10ef9a6a312bf7a501a0753fddcc8a3042S3VersionKeyAFF70CF1": {
"Type": "String",
"Description": "S3 key for asset version \"c70286a3d87ecc95aea2ffe7d7723ba303222280fb87f0128b3e83dcdd1d649e\""
"Description": "S3 key for asset version \"5b580ce3f53b1ee1551ac2e759433f10ef9a6a312bf7a501a0753fddcc8a3042\""
},
"AssetParametersc70286a3d87ecc95aea2ffe7d7723ba303222280fb87f0128b3e83dcdd1d649eArtifactHash88EDABBF": {
"AssetParameters5b580ce3f53b1ee1551ac2e759433f10ef9a6a312bf7a501a0753fddcc8a3042ArtifactHashD8735DDD": {
"Type": "String",
"Description": "Artifact hash for asset \"c70286a3d87ecc95aea2ffe7d7723ba303222280fb87f0128b3e83dcdd1d649e\""
"Description": "Artifact hash for asset \"5b580ce3f53b1ee1551ac2e759433f10ef9a6a312bf7a501a0753fddcc8a3042\""
},
"SsmParameterValueawsserviceeksoptimizedami116amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter": {
"Type": "AWS::SSM::Parameter::Value<String>",
Expand Down
6 changes: 5 additions & 1 deletion packages/@aws-cdk/aws-eks/test/integ.eks-cluster.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,11 @@ class EksClusterStack extends TestStack {
cluster.addResource('HelloApp', ...hello.resources);

// add two Helm charts to the cluster. This will be the Kubernetes dashboard and the Nginx Ingress Controller
cluster.addChart('dashboard', { chart: 'kubernetes-dashboard', repository: 'https://kubernetes-charts.storage.googleapis.com' });
cluster.addChart('dashboard', {
chart: 'kubernetes-dashboard',
repository: 'https://kubernetes.github.io/dashboard/',
});

cluster.addChart('nginx-ingress', {
chart: 'nginx-ingress',
repository: 'https://helm.nginx.com/stable',
Expand Down