Skip to content

Commit 73c6f9c

Browse files
Jimmy GaussenElad Ben-Israel
Jimmy Gaussen
authored and
Elad Ben-Israel
committed
feat(eks): upgrade latest kubertenes version to 1.14 (#4157)
* feat(eks): upgrade latest kubertenes version to 1.14 * fix: bump version in new cluster file * chore: bump ssm optimized-amis versions * chore: update imageId refs * feat: add scripts/kube_bump * chore: move kube_bump
1 parent 7e967ab commit 73c6f9c

7 files changed

+39
-17
lines changed

‎packages/@aws-cdk/aws-eks/lib/cluster.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -824,7 +824,8 @@ export class EksOptimizedImage implements ec2.IMachineImage {
824824
}
825825
}
826826

827-
const LATEST_KUBERNETES_VERSION = '1.13';
827+
// MAINTAINERS: use ./scripts/kube_bump.sh to update LATEST_KUBERNETES_VERSION
828+
const LATEST_KUBERNETES_VERSION = '1.14';
828829

829830
/**
830831
* Whether the worker nodes should support GPU or just standard instances

‎packages/@aws-cdk/aws-eks/scripts/kube_bump.sh

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
#!/bin/bash
2+
3+
if [ $# -lt 2 ]; then
4+
echo "usage: scripts/kube_bump.sh <previous_version> <new_version>"
5+
exit 1
6+
fi
7+
8+
PREVIOUS_KUBE_VERSION=$1
9+
LATEST_KUBE_VERSION=$2
10+
11+
SCRIPT_PATH="$( cd "$(dirname "$0")" ; pwd -P )"
12+
EKS_PATH="$SCRIPT_PATH/.."
13+
14+
sed -i "s/const LATEST_KUBERNETES_VERSION = '${PREVIOUS_KUBE_VERSION}/const LATEST_KUBERNETES_VERSION = '${LATEST_KUBE_VERSION}/" "$EKS_PATH/lib/cluster.ts"
15+
16+
INTEG_FILES=$(find "$EKS_PATH/test" -type f -name 'integ.*.json')
17+
echo "$INTEG_FILES" | xargs sed -i "s#eks/optimized-ami/${PREVIOUS_KUBE_VERSION}#eks/optimized-ami/${LATEST_KUBE_VERSION}#g"
18+
19+
NUMERIC_PREVIOUS_VERSION=$(sed 's/[^0-9]*//g' <<< "$PREVIOUS_KUBE_VERSION")
20+
NUMERIC_LATEST_VERSION=$(sed 's/[^0-9]*//g' <<< "$LATEST_KUBE_VERSION")
21+
echo "$INTEG_FILES" | xargs sed -i "s#awsserviceeksoptimizedami${NUMERIC_PREVIOUS_VERSION}amazonlinux2#awsserviceeksoptimizedami${NUMERIC_LATEST_VERSION}amazonlinux2#g"

‎packages/@aws-cdk/aws-eks/test/integ.eks-cluster.defaults.expected.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1051,7 +1051,7 @@
10511051
"Type": "AWS::AutoScaling::LaunchConfiguration",
10521052
"Properties": {
10531053
"ImageId": {
1054-
"Ref": "SsmParameterValueawsserviceeksoptimizedami113amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter"
1054+
"Ref": "SsmParameterValueawsserviceeksoptimizedami114amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter"
10551055
},
10561056
"InstanceType": "m5.large",
10571057
"IamInstanceProfile": {
@@ -1210,9 +1210,9 @@
12101210
"Type": "String",
12111211
"Description": "Artifact hash for asset \"eks-integ-defaults/Cluster/KubernetesResourceHandler/Code\""
12121212
},
1213-
"SsmParameterValueawsserviceeksoptimizedami113amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter": {
1213+
"SsmParameterValueawsserviceeksoptimizedami114amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter": {
12141214
"Type": "AWS::SSM::Parameter::Value<String>",
1215-
"Default": "/aws/service/eks/optimized-ami/1.13/amazon-linux-2/recommended/image_id"
1215+
"Default": "/aws/service/eks/optimized-ami/1.14/amazon-linux-2/recommended/image_id"
12161216
}
12171217
},
12181218
"Outputs": {

‎packages/@aws-cdk/aws-eks/test/integ.eks-cluster.kubectl-disabled.expected.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -837,7 +837,7 @@
837837
"Type": "AWS::AutoScaling::LaunchConfiguration",
838838
"Properties": {
839839
"ImageId": {
840-
"Ref": "SsmParameterValueawsserviceeksoptimizedami113amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter"
840+
"Ref": "SsmParameterValueawsserviceeksoptimizedami114amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter"
841841
},
842842
"InstanceType": "t2.medium",
843843
"IamInstanceProfile": {
@@ -932,9 +932,9 @@
932932
}
933933
},
934934
"Parameters": {
935-
"SsmParameterValueawsserviceeksoptimizedami113amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter": {
935+
"SsmParameterValueawsserviceeksoptimizedami114amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter": {
936936
"Type": "AWS::SSM::Parameter::Value<String>",
937-
"Default": "/aws/service/eks/optimized-ami/1.13/amazon-linux-2/recommended/image_id"
937+
"Default": "/aws/service/eks/optimized-ami/1.14/amazon-linux-2/recommended/image_id"
938938
}
939939
},
940940
"Outputs": {

‎packages/@aws-cdk/aws-eks/test/integ.eks-cluster.lit.expected.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1051,7 +1051,7 @@
10511051
"Type": "AWS::AutoScaling::LaunchConfiguration",
10521052
"Properties": {
10531053
"ImageId": {
1054-
"Ref": "SsmParameterValueawsserviceeksoptimizedami113amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter"
1054+
"Ref": "SsmParameterValueawsserviceeksoptimizedami114amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter"
10551055
},
10561056
"InstanceType": "t2.medium",
10571057
"IamInstanceProfile": {
@@ -1210,9 +1210,9 @@
12101210
"Type": "String",
12111211
"Description": "Artifact hash for asset \"eks-integ-test-basic/EKSCluster/KubernetesResourceHandler/Code\""
12121212
},
1213-
"SsmParameterValueawsserviceeksoptimizedami113amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter": {
1213+
"SsmParameterValueawsserviceeksoptimizedami114amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter": {
12141214
"Type": "AWS::SSM::Parameter::Value<String>",
1215-
"Default": "/aws/service/eks/optimized-ami/1.13/amazon-linux-2/recommended/image_id"
1215+
"Default": "/aws/service/eks/optimized-ami/1.14/amazon-linux-2/recommended/image_id"
12161216
}
12171217
},
12181218
"Outputs": {

‎packages/@aws-cdk/aws-eks/test/integ.eks-kubectl.lit.expected.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -966,7 +966,7 @@
966966
"Type": "AWS::AutoScaling::LaunchConfiguration",
967967
"Properties": {
968968
"ImageId": {
969-
"Ref": "SsmParameterValueawsserviceeksoptimizedami113amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter"
969+
"Ref": "SsmParameterValueawsserviceeksoptimizedami114amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter"
970970
},
971971
"InstanceType": "t2.medium",
972972
"IamInstanceProfile": {
@@ -1136,9 +1136,9 @@
11361136
"Type": "String",
11371137
"Description": "Artifact hash for asset \"k8s-cluster/cluster22/KubernetesResourceHandler/Code\""
11381138
},
1139-
"SsmParameterValueawsserviceeksoptimizedami113amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter": {
1139+
"SsmParameterValueawsserviceeksoptimizedami114amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter": {
11401140
"Type": "AWS::SSM::Parameter::Value<String>",
1141-
"Default": "/aws/service/eks/optimized-ami/1.13/amazon-linux-2/recommended/image_id"
1141+
"Default": "/aws/service/eks/optimized-ami/1.14/amazon-linux-2/recommended/image_id"
11421142
}
11431143
},
11441144
"Outputs": {

‎packages/@aws-cdk/aws-eks/test/integ.eks-spot.expected.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -905,7 +905,7 @@
905905
"Type": "AWS::AutoScaling::LaunchConfiguration",
906906
"Properties": {
907907
"ImageId": {
908-
"Ref": "SsmParameterValueawsserviceeksoptimizedami113amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter"
908+
"Ref": "SsmParameterValueawsserviceeksoptimizedami114amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter"
909909
},
910910
"InstanceType": "m5.large",
911911
"IamInstanceProfile": {
@@ -1226,7 +1226,7 @@
12261226
"Type": "AWS::AutoScaling::LaunchConfiguration",
12271227
"Properties": {
12281228
"ImageId": {
1229-
"Ref": "SsmParameterValueawsserviceeksoptimizedami113amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter"
1229+
"Ref": "SsmParameterValueawsserviceeksoptimizedami114amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter"
12301230
},
12311231
"InstanceType": "t3.large",
12321232
"IamInstanceProfile": {
@@ -1369,9 +1369,9 @@
13691369
"Type": "String",
13701370
"Description": "Artifact hash for asset \"integ-eks-spot/myCluster/KubernetesResourceHandler/Code\""
13711371
},
1372-
"SsmParameterValueawsserviceeksoptimizedami113amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter": {
1372+
"SsmParameterValueawsserviceeksoptimizedami114amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter": {
13731373
"Type": "AWS::SSM::Parameter::Value<String>",
1374-
"Default": "/aws/service/eks/optimized-ami/1.13/amazon-linux-2/recommended/image_id"
1374+
"Default": "/aws/service/eks/optimized-ami/1.14/amazon-linux-2/recommended/image_id"
13751375
}
13761376
},
13771377
"Outputs": {

0 commit comments

Comments
 (0)