Skip to content

Commit 3380742

Browse files
authored
fix(eks): update aws-node-termination-handler chart version (#34218)
### Issue # (if applicable) Closes #34217 ### Reason for this change - Current Chart version is 0.18.0 https://artifacthub.io/packages/helm/aws/aws-node-termination-handler/0.18.0 https://github.com/aws/aws-cdk/blob/58c2631de585b300cf8573ab423dcc75791cc3d2/packages/aws-cdk-lib/aws-eks/lib/cluster.ts#L1184-L1188 - Latest available version is 0.27.0 https://artifacthub.io/packages/helm/aws-node-termination-handler/aws-node-termination-handler - The outdated version of aws-node-termination-handler (0.18.0) is causing cluster creation failures for Kubernetes v1.25 and above. - Related: aws/aws-node-termination-handler#638 ### Description of changes Update aws-node-termination-handler chart version ### Describe any new or updated permissions being added None ### Description of how you validated changes Pass unit/integration tests ### Checklist - [x] My code adheres to the [CONTRIBUTING GUIDE](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) and [DESIGN GUIDELINES](https://github.com/aws/aws-cdk/blob/main/docs/DESIGN_GUIDELINES.md) ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
1 parent feadd8c commit 3380742

File tree

44 files changed

+221
-21170
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+221
-21170
lines changed
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-ipv6.js.snapshot/asset.c475180f5b1bbabac165414da13a9b843b111cd3b6d5fae9c954c006640c4064.zip

-3
This file was deleted.

packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-ipv6.js.snapshot/asset.e42a736be21cd3134b9bff4e71e3afa99a4cc900ae489e9a7f7025c8d258f9b8.zip

-3
This file was deleted.

packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-ipv6.js.snapshot/aws-cdk-eks-cluster-ipv6-test.assets.json

+31-19
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-ipv6.js.snapshot/aws-cdk-eks-cluster-ipv6-test.template.json

+17-17
Original file line numberDiff line numberDiff line change
@@ -610,9 +610,9 @@
610610
"S3Bucket": {
611611
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1"
612612
},
613-
"S3Key": "c475180f5b1bbabac165414da13a9b843b111cd3b6d5fae9c954c006640c4064.zip"
613+
"S3Key": "6094cb0ff874f89ab5ab24fb6b9417df0fdeb6966645f90c88ec1d7e28130112.zip"
614614
},
615-
"Description": "/opt/kubectl/kubectl 1.24; /opt/helm/helm 3.9",
615+
"Description": "/opt/kubectl/kubectl 1.32.3; /opt/helm/helm 3.17.2",
616616
"LicenseInfo": "Apache-2.0"
617617
}
618618
},
@@ -1162,7 +1162,7 @@
11621162
]
11631163
},
11641164
"Config": {
1165-
"version": "1.24",
1165+
"version": "1.32",
11661166
"roleArn": {
11671167
"Fn::GetAtt": [
11681168
"ClusterRoleFA261979",
@@ -2235,7 +2235,7 @@
22352235
}
22362236
},
22372237
"ImageId": {
2238-
"Ref": "SsmParameterValueawsserviceeksoptimizedami124amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter"
2238+
"Ref": "SsmParameterValueawsserviceeksoptimizedami132amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter"
22392239
},
22402240
"InstanceType": "t2.medium",
22412241
"Monitoring": {
@@ -2688,7 +2688,7 @@
26882688
}
26892689
},
26902690
"ImageId": {
2691-
"Ref": "SsmParameterValueawsserviceeksoptimizedami124amazonlinux2arm64recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter"
2691+
"Ref": "SsmParameterValueawsserviceeksoptimizedami132amazonlinux2arm64recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter"
26922692
},
26932693
"InstanceType": "m6g.medium",
26942694
"Monitoring": {
@@ -3141,7 +3141,7 @@
31413141
}
31423142
},
31433143
"ImageId": {
3144-
"Ref": "SsmParameterValueawsservicebottlerocketawsk8s124x8664latestimageidC96584B6F00A464EAD1953AFF4B05118Parameter"
3144+
"Ref": "SsmParameterValueawsservicebottlerocketawsk8s132x8664latestimageidC96584B6F00A464EAD1953AFF4B05118Parameter"
31453145
},
31463146
"InstanceType": "t3.small",
31473147
"Monitoring": {
@@ -3594,7 +3594,7 @@
35943594
}
35953595
},
35963596
"ImageId": {
3597-
"Ref": "SsmParameterValueawsserviceeksoptimizedami124amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter"
3597+
"Ref": "SsmParameterValueawsserviceeksoptimizedami132amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter"
35983598
},
35993599
"InstanceMarketOptions": {
36003600
"MarketType": "spot",
@@ -3804,10 +3804,10 @@
38043804
},
38053805
"Release": "usteripv6testclusterchartspotinterrupthandlere35c3de9",
38063806
"Chart": "aws-node-termination-handler",
3807-
"Version": "0.18.0",
3807+
"Version": "0.27.0",
38083808
"Values": "{\"nodeSelector\":{\"lifecycle\":\"Ec2Spot\"}}",
38093809
"Namespace": "kube-system",
3810-
"Repository": "https://aws.github.io/eks-charts",
3810+
"Repository": "oci://public.ecr.aws/aws-ec2/helm/aws-node-termination-handler",
38113811
"CreateNamespace": true
38123812
},
38133813
"DependsOn": [
@@ -4826,7 +4826,7 @@
48264826
{
48274827
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1"
48284828
},
4829-
"/7b41186481ccdfdc914422d9e0daf23f38ca44970b0e742d61e958215049accf.json"
4829+
"/2d5ad1dbed21a3c49fb0bc3666d18d12803ad769af1b832c8489dc973fd18114.json"
48304830
]
48314831
]
48324832
}
@@ -4872,7 +4872,7 @@
48724872
{
48734873
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1"
48744874
},
4875-
"/366239f412dc753bb79d925e79d121f75cb1d3395546cd29951fd7a8e2b6ff16.json"
4875+
"/bf415411c3693e31a11c0b68826d3426f0afdf2c2b9589a2cd8d6fd95c42a5df.json"
48764876
]
48774877
]
48784878
}
@@ -5152,17 +5152,17 @@
51525152
}
51535153
},
51545154
"Parameters": {
5155-
"SsmParameterValueawsserviceeksoptimizedami124amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter": {
5155+
"SsmParameterValueawsserviceeksoptimizedami132amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter": {
51565156
"Type": "AWS::SSM::Parameter::Value<String>",
5157-
"Default": "/aws/service/eks/optimized-ami/1.24/amazon-linux-2/recommended/image_id"
5157+
"Default": "/aws/service/eks/optimized-ami/1.32/amazon-linux-2/recommended/image_id"
51585158
},
5159-
"SsmParameterValueawsserviceeksoptimizedami124amazonlinux2arm64recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter": {
5159+
"SsmParameterValueawsserviceeksoptimizedami132amazonlinux2arm64recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter": {
51605160
"Type": "AWS::SSM::Parameter::Value<String>",
5161-
"Default": "/aws/service/eks/optimized-ami/1.24/amazon-linux-2-arm64/recommended/image_id"
5161+
"Default": "/aws/service/eks/optimized-ami/1.32/amazon-linux-2-arm64/recommended/image_id"
51625162
},
5163-
"SsmParameterValueawsservicebottlerocketawsk8s124x8664latestimageidC96584B6F00A464EAD1953AFF4B05118Parameter": {
5163+
"SsmParameterValueawsservicebottlerocketawsk8s132x8664latestimageidC96584B6F00A464EAD1953AFF4B05118Parameter": {
51645164
"Type": "AWS::SSM::Parameter::Value<String>",
5165-
"Default": "/aws/service/bottlerocket/aws-k8s-1.24/x86_64/latest/image_id"
5165+
"Default": "/aws/service/bottlerocket/aws-k8s-1.32/x86_64/latest/image_id"
51665166
},
51675167
"SsmParameterValueawsserviceeksoptimizedami125amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter": {
51685168
"Type": "AWS::SSM::Parameter::Value<String>",

packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-ipv6.js.snapshot/awscdkeksclusteripv6DefaultTestDeployAssert2C014107.assets.json

+2-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-ipv6.js.snapshot/awscdkeksclusteripv6testawscdkawseksClusterResourceProviderAC8DB286.nested.template.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"S3Bucket": {
5151
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1"
5252
},
53-
"S3Key": "572dd2416e786aa13287a5bcd2330ca9b49d9bb7403340990da8b466445db001.zip"
53+
"S3Key": "5e26fe1db8ce3c4e3a4463e9e01996ba9baa7f2e468aa7ce30fd593883b306ab.zip"
5454
},
5555
"Description": "onEvent handler for EKS cluster resource provider",
5656
"Environment": {
@@ -115,7 +115,7 @@
115115
"S3Bucket": {
116116
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1"
117117
},
118-
"S3Key": "572dd2416e786aa13287a5bcd2330ca9b49d9bb7403340990da8b466445db001.zip"
118+
"S3Key": "5e26fe1db8ce3c4e3a4463e9e01996ba9baa7f2e468aa7ce30fd593883b306ab.zip"
119119
},
120120
"Description": "isComplete handler for EKS cluster resource provider",
121121
"Environment": {

packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-ipv6.js.snapshot/awscdkeksclusteripv6testawscdkawseksKubectlProvider3E7CED93.nested.template.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"S3Bucket": {
88
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1"
99
},
10-
"S3Key": "fba306965da4b2680dd8b4e6916610efe237162f913f22b10146f647b3f6bce4.zip"
10+
"S3Key": "96b83d7c7535f7e731e0679249de9470f417342331b121e36664078b4ef4a11b.zip"
1111
},
1212
"Description": "onEvent handler for EKS kubectl resource provider",
1313
"Environment": {
@@ -54,7 +54,7 @@
5454
"S3Bucket": {
5555
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1"
5656
},
57-
"S3Key": "e42a736be21cd3134b9bff4e71e3afa99a4cc900ae489e9a7f7025c8d258f9b8.zip"
57+
"S3Key": "12157b27d30ab71eb24ae65825f672ba5cc2c09dbb1703cd7adfcff3aeaca136.zip"
5858
},
5959
"Description": "/opt/awscli/aws"
6060
}

packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-ipv6.js.snapshot/cdk.out

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.eks-cluster-ipv6.js.snapshot/integ.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)