*: use 1.20 as default EKS version

Signed-off-by: Gyuho Lee <[email protected]>
aws · May 27, 2021 · 8f6b051 · 8f6b051
1 parent 5fb1f17
commit 8f6b051
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/eks/cluster/cluster.go b/eks/cluster/cluster.go
@@ -235,7 +235,7 @@ Parameters:
 
   Version:
     Type: String
-    Default: 1.18
+    Default: 1.20
     Description: Specify the EKS version
 
   RoleARN:

diff --git a/eks/ng/autoscaler/cluster-autoscaler.go b/eks/ng/autoscaler/cluster-autoscaler.go
@@ -199,6 +199,8 @@ var caImages = map[string]string{
 	"1.16": `        - image: us.gcr.io/k8s-artifacts-prod/autoscaling/cluster-autoscaler:v1.16.5`,
 	"1.17": `        - image: us.gcr.io/k8s-artifacts-prod/autoscaling/cluster-autoscaler:v1.17.2`,
 	"1.18": `        - image: us.gcr.io/k8s-artifacts-prod/autoscaling/cluster-autoscaler:v1.18.0`,
+	"1.19": `        - image: us.gcr.io/k8s-artifacts-prod/autoscaling/cluster-autoscaler:v1.19.0`,
+	"1.20": `        - image: us.gcr.io/k8s-artifacts-prod/autoscaling/cluster-autoscaler:v1.20.0`,
 }
 
 const (

diff --git a/eks/ng/nodes.go b/eks/ng/nodes.go
@@ -33,8 +33,8 @@ e.g.
 aws ssm get-parameters --names /aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2
 
 e.g.
-aws ssm get-parameters --names /aws/service/eks/optimized-ami/1.18/amazon-linux-2/recommended/image_id
-aws ssm get-parameters --names /aws/service/bottlerocket/aws-k8s-1.18/x86_64/latest/image_id
+aws ssm get-parameters --names /aws/service/eks/optimized-ami/1.20/amazon-linux-2/recommended/image_id
+aws ssm get-parameters --names /aws/service/bottlerocket/aws-k8s-1.20/x86_64/latest/image_id
 
 NOTE for new regions
 "AWS::SSM::Parameter" may not be onboarded yet, so we need templatize CFN template
@@ -108,7 +108,7 @@ Parameters:
     Default: ""
     Description: Specify your own custom image ID. This value overrides any AWS Systems Manager Parameter Store value specified above.{{ end }}{{ if ne .ImageIDSSMParameter "" }}  ImageIDSSMParameter:
     Type: AWS::SSM::Parameter::Value<AWS::EC2::Image::Id>
-    Default: /aws/service/eks/optimized-ami/1.18/amazon-linux-2/recommended/image_id
+    Default: /aws/service/eks/optimized-ami/1.20/amazon-linux-2/recommended/image_id
     Description: AWS Systems Manager Parameter Store parameter of the AMI ID for the worker node instances.{{ end }}
 
   InstanceTypes:

diff --git a/eksconfig/add-on-cluster-version-upgrade.go b/eksconfig/add-on-cluster-version-upgrade.go
@@ -48,7 +48,7 @@ func (cfg *Config) IsEnabledAddOnClusterVersionUpgrade() bool {
 func getDefaultAddOnClusterVersionUpgrade() *AddOnClusterVersionUpgrade {
 	return &AddOnClusterVersionUpgrade{
 		Enable:            false,
-		Version:           "1.18",
+		Version:           "1.20",
 		WaitBeforeUpgrade: 3 * time.Minute,
 	}
 }

diff --git a/eksconfig/config.go b/eksconfig/config.go
@@ -506,7 +506,7 @@ func getDefaultParameters() *Parameters {
 		PrivateSubnetCIDR1:  "10.3.0.0/17",
 		PrivateSubnetCIDR2:  "10.3.128.0/17",
 		SigningName:         "eks",
-		Version:             "1.18",
+		Version:             "1.20",
 		EncryptionCMKCreate: true,
 	}
 }
@@ -830,8 +830,8 @@ func NewDefault() *Config {
 		// https://github.com/kubernetes/kubernetes/tags
 		// https://kubernetes.io/docs/tasks/tools/install-kubectl/
 		// https://docs.aws.amazon.com/eks/latest/userguide/install-kubectl.html
-		KubectlPath:        "/tmp/kubectl-test-v1.18.9",
-		KubectlDownloadURL: "https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/amd64/kubectl",
+		KubectlPath:        "/tmp/kubectl-test-v1.20.0",
+		KubectlDownloadURL: "https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/amd64/kubectl",
 
 		OnFailureDelete:            true,
 		OnFailureDeleteWaitSeconds: 120,