diff --git a/packages/@aws-cdk/aws-eks/lib/cluster.ts b/packages/@aws-cdk/aws-eks/lib/cluster.ts index 549c5b1b29f47..bae26dad2b737 100644 --- a/packages/@aws-cdk/aws-eks/lib/cluster.ts +++ b/packages/@aws-cdk/aws-eks/lib/cluster.ts @@ -824,7 +824,8 @@ export class EksOptimizedImage implements ec2.IMachineImage { } } -const LATEST_KUBERNETES_VERSION = '1.13'; +// MAINTAINERS: use ./scripts/kube_bump.sh to update LATEST_KUBERNETES_VERSION +const LATEST_KUBERNETES_VERSION = '1.14'; /** * Whether the worker nodes should support GPU or just standard instances diff --git a/packages/@aws-cdk/aws-eks/scripts/kube_bump.sh b/packages/@aws-cdk/aws-eks/scripts/kube_bump.sh new file mode 100644 index 0000000000000..1a051886a86db --- /dev/null +++ b/packages/@aws-cdk/aws-eks/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/.." + +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 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..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,9 +1210,9 @@ "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.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..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,9 +932,9 @@ } }, "Parameters": { - "SsmParameterValueawsserviceeksoptimizedami113amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter": { + "SsmParameterValueawsserviceeksoptimizedami114amazonlinux2recommendedimageidC96584B6F00A464EAD1953AFF4B05118Parameter": { "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..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,9 +1210,9 @@ "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.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..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,9 +1136,9 @@ "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.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..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,9 +1369,9 @@ "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.13/amazon-linux-2/recommended/image_id" + "Default": "/aws/service/eks/optimized-ami/1.14/amazon-linux-2/recommended/image_id" } }, "Outputs": {