From 62269d980a3d2687de4593af0ba6454cee834d4e Mon Sep 17 00:00:00 2001 From: Jimmy Gaussen Date: Thu, 19 Sep 2019 10:45:35 +0200 Subject: [PATCH 1/6] feat(eks): upgrade latest kubertenes version to 1.14 --- packages/@aws-cdk/aws-eks/lib/ami.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@aws-cdk/aws-eks/lib/ami.ts b/packages/@aws-cdk/aws-eks/lib/ami.ts index 0fe02135f525c..fcc676e0138ea 100644 --- a/packages/@aws-cdk/aws-eks/lib/ami.ts +++ b/packages/@aws-cdk/aws-eks/lib/ami.ts @@ -32,7 +32,7 @@ export class EksOptimizedAmi extends ec2.GenericLinuxImage implements ec2.IMachi } } -const LATEST_KUBERNETES_VERSION = '1.13'; +const LATEST_KUBERNETES_VERSION = '1.14'; /** * Whether the worker nodes should support GPU or just normal instances From bacb899f53f7523cb69c1ff873306ed7d1dacdb0 Mon Sep 17 00:00:00 2001 From: Jimmy Gaussen Date: Mon, 23 Sep 2019 14:42:27 +0200 Subject: [PATCH 2/6] fix: bump version in new cluster file --- packages/@aws-cdk/aws-eks/lib/cluster.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@aws-cdk/aws-eks/lib/cluster.ts b/packages/@aws-cdk/aws-eks/lib/cluster.ts index 549c5b1b29f47..24e12355fbda9 100644 --- a/packages/@aws-cdk/aws-eks/lib/cluster.ts +++ b/packages/@aws-cdk/aws-eks/lib/cluster.ts @@ -824,7 +824,7 @@ export class EksOptimizedImage implements ec2.IMachineImage { } } -const LATEST_KUBERNETES_VERSION = '1.13'; +const LATEST_KUBERNETES_VERSION = '1.14'; /** * Whether the worker nodes should support GPU or just standard instances From b9d16a6ef0daeb4747371537bf1d1ff36a1027d2 Mon Sep 17 00:00:00 2001 From: Jimmy Gaussen Date: Mon, 23 Sep 2019 14:43:09 +0200 Subject: [PATCH 3/6] chore: bump ssm optimized-amis versions --- .../aws-eks/test/integ.eks-cluster.defaults.expected.json | 2 +- .../test/integ.eks-cluster.kubectl-disabled.expected.json | 2 +- .../@aws-cdk/aws-eks/test/integ.eks-cluster.lit.expected.json | 2 +- .../@aws-cdk/aws-eks/test/integ.eks-kubectl.lit.expected.json | 2 +- packages/@aws-cdk/aws-eks/test/integ.eks-spot.expected.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.defaults.expected.json b/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.defaults.expected.json index ed570b37e1105..c38d6b46d9b6e 100644 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.defaults.expected.json +++ b/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.defaults.expected.json @@ -1212,7 +1212,7 @@ }, "SsmParameterValueawsserviceeksoptimizedami113amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter": { "Type": "AWS::SSM::Parameter::Value", - "Default": "/aws/service/eks/optimized-ami/1.13/amazon-linux-2/recommended/image_id" + "Default": "/aws/service/eks/optimized-ami/1.14/amazon-linux-2/recommended/image_id" } }, "Outputs": { diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.kubectl-disabled.expected.json b/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.kubectl-disabled.expected.json index dafe74d5d8013..ec2754d7a9719 100644 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.kubectl-disabled.expected.json +++ b/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.kubectl-disabled.expected.json @@ -934,7 +934,7 @@ "Parameters": { "SsmParameterValueawsserviceeksoptimizedami113amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter": { "Type": "AWS::SSM::Parameter::Value", - "Default": "/aws/service/eks/optimized-ami/1.13/amazon-linux-2/recommended/image_id" + "Default": "/aws/service/eks/optimized-ami/1.14/amazon-linux-2/recommended/image_id" } }, "Outputs": { diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.lit.expected.json b/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.lit.expected.json index 99ba7862a2c9c..6e5a9309831fe 100644 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.lit.expected.json +++ b/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.lit.expected.json @@ -1212,7 +1212,7 @@ }, "SsmParameterValueawsserviceeksoptimizedami113amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter": { "Type": "AWS::SSM::Parameter::Value", - "Default": "/aws/service/eks/optimized-ami/1.13/amazon-linux-2/recommended/image_id" + "Default": "/aws/service/eks/optimized-ami/1.14/amazon-linux-2/recommended/image_id" } }, "Outputs": { diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-kubectl.lit.expected.json b/packages/@aws-cdk/aws-eks/test/integ.eks-kubectl.lit.expected.json index cccdd564261c7..3708f4124ac5c 100644 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-kubectl.lit.expected.json +++ b/packages/@aws-cdk/aws-eks/test/integ.eks-kubectl.lit.expected.json @@ -1138,7 +1138,7 @@ }, "SsmParameterValueawsserviceeksoptimizedami113amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter": { "Type": "AWS::SSM::Parameter::Value", - "Default": "/aws/service/eks/optimized-ami/1.13/amazon-linux-2/recommended/image_id" + "Default": "/aws/service/eks/optimized-ami/1.14/amazon-linux-2/recommended/image_id" } }, "Outputs": { diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-spot.expected.json b/packages/@aws-cdk/aws-eks/test/integ.eks-spot.expected.json index 5c5bfddd79da8..d99d371f61d6e 100644 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-spot.expected.json +++ b/packages/@aws-cdk/aws-eks/test/integ.eks-spot.expected.json @@ -1371,7 +1371,7 @@ }, "SsmParameterValueawsserviceeksoptimizedami113amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter": { "Type": "AWS::SSM::Parameter::Value", - "Default": "/aws/service/eks/optimized-ami/1.13/amazon-linux-2/recommended/image_id" + "Default": "/aws/service/eks/optimized-ami/1.14/amazon-linux-2/recommended/image_id" } }, "Outputs": { From 3a3f434e95685ddfb6c5fe8dac409c5c6973b7fc Mon Sep 17 00:00:00 2001 From: Jimmy Gaussen Date: Mon, 23 Sep 2019 14:56:06 +0200 Subject: [PATCH 4/6] chore: update imageId refs --- .../aws-eks/test/integ.eks-cluster.defaults.expected.json | 4 ++-- .../test/integ.eks-cluster.kubectl-disabled.expected.json | 4 ++-- .../aws-eks/test/integ.eks-cluster.lit.expected.json | 4 ++-- .../aws-eks/test/integ.eks-kubectl.lit.expected.json | 4 ++-- packages/@aws-cdk/aws-eks/test/integ.eks-spot.expected.json | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.defaults.expected.json b/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.defaults.expected.json index c38d6b46d9b6e..260d944cd3d28 100644 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.defaults.expected.json +++ b/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.defaults.expected.json @@ -1051,7 +1051,7 @@ "Type": "AWS::AutoScaling::LaunchConfiguration", "Properties": { "ImageId": { - "Ref": "SsmParameterValueawsserviceeksoptimizedami113amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter" + "Ref": "SsmParameterValueawsserviceeksoptimizedami114amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter" }, "InstanceType": "m5.large", "IamInstanceProfile": { @@ -1210,7 +1210,7 @@ "Type": "String", "Description": "Artifact hash for asset \"eks-integ-defaults/Cluster/KubernetesResourceHandler/Code\"" }, - "SsmParameterValueawsserviceeksoptimizedami113amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter": { + "SsmParameterValueawsserviceeksoptimizedami114amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter": { "Type": "AWS::SSM::Parameter::Value", "Default": "/aws/service/eks/optimized-ami/1.14/amazon-linux-2/recommended/image_id" } diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.kubectl-disabled.expected.json b/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.kubectl-disabled.expected.json index ec2754d7a9719..121d53b46ceef 100644 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.kubectl-disabled.expected.json +++ b/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.kubectl-disabled.expected.json @@ -837,7 +837,7 @@ "Type": "AWS::AutoScaling::LaunchConfiguration", "Properties": { "ImageId": { - "Ref": "SsmParameterValueawsserviceeksoptimizedami113amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter" + "Ref": "SsmParameterValueawsserviceeksoptimizedami114amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter" }, "InstanceType": "t2.medium", "IamInstanceProfile": { @@ -932,7 +932,7 @@ } }, "Parameters": { - "SsmParameterValueawsserviceeksoptimizedami113amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter": { + "SsmParameterValueawsserviceeksoptimizedami114amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter": { "Type": "AWS::SSM::Parameter::Value", "Default": "/aws/service/eks/optimized-ami/1.14/amazon-linux-2/recommended/image_id" } diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.lit.expected.json b/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.lit.expected.json index 6e5a9309831fe..62c42b4130521 100644 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.lit.expected.json +++ b/packages/@aws-cdk/aws-eks/test/integ.eks-cluster.lit.expected.json @@ -1051,7 +1051,7 @@ "Type": "AWS::AutoScaling::LaunchConfiguration", "Properties": { "ImageId": { - "Ref": "SsmParameterValueawsserviceeksoptimizedami113amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter" + "Ref": "SsmParameterValueawsserviceeksoptimizedami114amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter" }, "InstanceType": "t2.medium", "IamInstanceProfile": { @@ -1210,7 +1210,7 @@ "Type": "String", "Description": "Artifact hash for asset \"eks-integ-test-basic/EKSCluster/KubernetesResourceHandler/Code\"" }, - "SsmParameterValueawsserviceeksoptimizedami113amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter": { + "SsmParameterValueawsserviceeksoptimizedami114amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter": { "Type": "AWS::SSM::Parameter::Value", "Default": "/aws/service/eks/optimized-ami/1.14/amazon-linux-2/recommended/image_id" } diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-kubectl.lit.expected.json b/packages/@aws-cdk/aws-eks/test/integ.eks-kubectl.lit.expected.json index 3708f4124ac5c..a4a46043e1b8c 100644 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-kubectl.lit.expected.json +++ b/packages/@aws-cdk/aws-eks/test/integ.eks-kubectl.lit.expected.json @@ -966,7 +966,7 @@ "Type": "AWS::AutoScaling::LaunchConfiguration", "Properties": { "ImageId": { - "Ref": "SsmParameterValueawsserviceeksoptimizedami113amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter" + "Ref": "SsmParameterValueawsserviceeksoptimizedami114amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter" }, "InstanceType": "t2.medium", "IamInstanceProfile": { @@ -1136,7 +1136,7 @@ "Type": "String", "Description": "Artifact hash for asset \"k8s-cluster/cluster22/KubernetesResourceHandler/Code\"" }, - "SsmParameterValueawsserviceeksoptimizedami113amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter": { + "SsmParameterValueawsserviceeksoptimizedami114amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter": { "Type": "AWS::SSM::Parameter::Value", "Default": "/aws/service/eks/optimized-ami/1.14/amazon-linux-2/recommended/image_id" } diff --git a/packages/@aws-cdk/aws-eks/test/integ.eks-spot.expected.json b/packages/@aws-cdk/aws-eks/test/integ.eks-spot.expected.json index d99d371f61d6e..58261229a2a4b 100644 --- a/packages/@aws-cdk/aws-eks/test/integ.eks-spot.expected.json +++ b/packages/@aws-cdk/aws-eks/test/integ.eks-spot.expected.json @@ -905,7 +905,7 @@ "Type": "AWS::AutoScaling::LaunchConfiguration", "Properties": { "ImageId": { - "Ref": "SsmParameterValueawsserviceeksoptimizedami113amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter" + "Ref": "SsmParameterValueawsserviceeksoptimizedami114amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter" }, "InstanceType": "m5.large", "IamInstanceProfile": { @@ -1226,7 +1226,7 @@ "Type": "AWS::AutoScaling::LaunchConfiguration", "Properties": { "ImageId": { - "Ref": "SsmParameterValueawsserviceeksoptimizedami113amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter" + "Ref": "SsmParameterValueawsserviceeksoptimizedami114amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter" }, "InstanceType": "t3.large", "IamInstanceProfile": { @@ -1369,7 +1369,7 @@ "Type": "String", "Description": "Artifact hash for asset \"integ-eks-spot/myCluster/KubernetesResourceHandler/Code\"" }, - "SsmParameterValueawsserviceeksoptimizedami113amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter": { + "SsmParameterValueawsserviceeksoptimizedami114amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter": { "Type": "AWS::SSM::Parameter::Value", "Default": "/aws/service/eks/optimized-ami/1.14/amazon-linux-2/recommended/image_id" } From 230f940427ed35c1055c89f15e672d7a27ff7c9b Mon Sep 17 00:00:00 2001 From: Jimmy Gaussen Date: Mon, 23 Sep 2019 15:37:00 +0200 Subject: [PATCH 5/6] feat: add scripts/kube_bump --- packages/@aws-cdk/aws-eks/lib/cluster.ts | 1 + scripts/kube_bump.sh | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 scripts/kube_bump.sh diff --git a/packages/@aws-cdk/aws-eks/lib/cluster.ts b/packages/@aws-cdk/aws-eks/lib/cluster.ts index 24e12355fbda9..bae26dad2b737 100644 --- a/packages/@aws-cdk/aws-eks/lib/cluster.ts +++ b/packages/@aws-cdk/aws-eks/lib/cluster.ts @@ -824,6 +824,7 @@ export class EksOptimizedImage implements ec2.IMachineImage { } } +// MAINTAINERS: use ./scripts/kube_bump.sh to update LATEST_KUBERNETES_VERSION const LATEST_KUBERNETES_VERSION = '1.14'; /** diff --git a/scripts/kube_bump.sh b/scripts/kube_bump.sh new file mode 100644 index 0000000000000..5df331d33396d --- /dev/null +++ b/scripts/kube_bump.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +if [ $# -lt 2 ]; then + echo "usage: scripts/kube_bump.sh " + exit 1 +fi + +PREVIOUS_KUBE_VERSION=$1 +LATEST_KUBE_VERSION=$2 + +SCRIPT_PATH="$( cd "$(dirname "$0")" ; pwd -P )" +EKS_PATH="$SCRIPT_PATH/../packages/@aws-cdk/aws-eks" + +sed -i "s/const LATEST_KUBERNETES_VERSION = '${PREVIOUS_KUBE_VERSION}/const LATEST_KUBERNETES_VERSION = '${LATEST_KUBE_VERSION}/" "$EKS_PATH/lib/cluster.ts" + +INTEG_FILES=$(find "$EKS_PATH/test" -type f -name 'integ.*.json') +echo "$INTEG_FILES" | xargs sed -i "s#eks/optimized-ami/${PREVIOUS_KUBE_VERSION}#eks/optimized-ami/${LATEST_KUBE_VERSION}#g" + +NUMERIC_PREVIOUS_VERSION=$(sed 's/[^0-9]*//g' <<< "$PREVIOUS_KUBE_VERSION") +NUMERIC_LATEST_VERSION=$(sed 's/[^0-9]*//g' <<< "$LATEST_KUBE_VERSION") +echo "$INTEG_FILES" | xargs sed -i "s#awsserviceeksoptimizedami${NUMERIC_PREVIOUS_VERSION}amazonlinux2#awsserviceeksoptimizedami${NUMERIC_LATEST_VERSION}amazonlinux2#g" \ No newline at end of file From 969313569f903342ed1b1fb348ffa0e34a484e3f Mon Sep 17 00:00:00 2001 From: Jimmy Gaussen Date: Mon, 23 Sep 2019 15:52:06 +0200 Subject: [PATCH 6/6] chore: move kube_bump --- {scripts => packages/@aws-cdk/aws-eks/scripts}/kube_bump.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename {scripts => packages/@aws-cdk/aws-eks/scripts}/kube_bump.sh (94%) diff --git a/scripts/kube_bump.sh b/packages/@aws-cdk/aws-eks/scripts/kube_bump.sh similarity index 94% rename from scripts/kube_bump.sh rename to packages/@aws-cdk/aws-eks/scripts/kube_bump.sh index 5df331d33396d..1a051886a86db 100644 --- a/scripts/kube_bump.sh +++ b/packages/@aws-cdk/aws-eks/scripts/kube_bump.sh @@ -9,7 +9,7 @@ PREVIOUS_KUBE_VERSION=$1 LATEST_KUBE_VERSION=$2 SCRIPT_PATH="$( cd "$(dirname "$0")" ; pwd -P )" -EKS_PATH="$SCRIPT_PATH/../packages/@aws-cdk/aws-eks" +EKS_PATH="$SCRIPT_PATH/.." sed -i "s/const LATEST_KUBERNETES_VERSION = '${PREVIOUS_KUBE_VERSION}/const LATEST_KUBERNETES_VERSION = '${LATEST_KUBE_VERSION}/" "$EKS_PATH/lib/cluster.ts"