add: support for EKS v1.31 (#252)

awslabs · Oct 2, 2024 · ab47ea9 · ab47ea9
1 parent 2266e9d
commit ab47ea9
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -178,8 +178,8 @@ To validate the AWS region is set, you can run **`eksdemo get cluster`** which w
 +------------+--------+---------+---------+----------+----------+
 |    Age     | Status | Cluster | Version | Platform | Endpoint |
 +------------+--------+---------+---------+----------+----------+
-| 3 weeks    | ACTIVE | green   |    1.27 | eks.17   | Public   |
-| 20 minutes | ACTIVE | *blue   |    1.30 | eks.6    | Public   |
+| 3 weeks    | ACTIVE | green   |    1.27 | eks.23   | Public   |
+| 20 minutes | ACTIVE | *blue   |    1.31 | eks.2    | Public   |
 +------------+--------+---------+---------+----------+----------+
 * Indicates current context in local kubeconfig
 ```

diff --git a/pkg/application/autoscaling/cluster_autoscaler/cluster_autoscaler.go b/pkg/application/autoscaling/cluster_autoscaler/cluster_autoscaler.go
@@ -13,7 +13,7 @@ import (
 // GitHub:  https://github.com/kubernetes/autoscaler/tree/master/cluster-autoscaler/cloudprovider/aws
 // Helm:    https://github.com/kubernetes/autoscaler/tree/master/charts/cluster-autoscaler
 // Repo:    registry.k8s.io/autoscaling/cluster-autoscaler
-// Version: Latest for k8s 1.30 is v1.30.1 (as of 5/31/24)
+// Version: Latest for k8s 1.31 is v1.31.0 (as of 9/30/24)
 
 func NewApp() *application.Application {
 	app := &application.Application{
@@ -40,21 +40,23 @@ func NewApp() *application.Application {
 			Namespace:      "kube-system",
 			ServiceAccount: "cluster-autoscaler",
 			DefaultVersion: &application.KubernetesVersionDependent{
-				LatestChart: "9.37.0",
+				LatestChart: "9.42.0",
 				Latest: map[string]string{
-					"1.30": "v1.30.1",
-					"1.29": "v1.29.3",
-					"1.28": "v1.28.5",
+					"1.31": "v1.31.0",
+					"1.30": "v1.30.2",
+					"1.29": "v1.29.4",
+					"1.28": "v1.28.6",
 					"1.27": "v1.27.8",
 					"1.26": "v1.26.8",
 					"1.25": "v1.25.3",
 					"1.24": "v1.24.3",
 				},
-				PreviousChart: "9.34.1",
+				PreviousChart: "9.37.0",
 				Previous: map[string]string{
-					"1.30": "v1.30.0",
-					"1.29": "v1.29.0",
-					"1.28": "v1.28.2",
+					"1.31": "v1.31.0",
+					"1.30": "v1.30.1",
+					"1.29": "v1.29.3",
+					"1.28": "v1.28.5",
 					"1.27": "v1.27.5",
 					"1.26": "v1.26.6",
 					"1.25": "v1.25.1",

diff --git a/pkg/eksctl/eksctl.go b/pkg/eksctl/eksctl.go
@@ -9,7 +9,7 @@ import (
 	"github.com/hashicorp/go-version"
 )
 
-const minVersion = "0.179.0"
+const minVersion = "0.191.0"
 
 func GetClusterName(cluster string) string {
 	return fmt.Sprintf("%s.%s.eksctl.io", cluster, aws.Region())

diff --git a/pkg/resource/cluster/options.go b/pkg/resource/cluster/options.go
@@ -53,7 +53,7 @@ func addOptions(res *resource.Resource) *resource.Resource {
 	options := &ClusterOptions{
 		CommonOptions: resource.CommonOptions{
 			ClusterFlagDisabled: true,
-			KubernetesVersion:   "1.30",
+			KubernetesVersion:   "1.31",
 		},
 
 		HostnameType:     string(types.HostnameTypeResourceName),
@@ -92,7 +92,7 @@ func addOptions(res *resource.Resource) *resource.Resource {
 				Description: "Kubernetes version",
 				Shorthand:   "v",
 			},
-			Choices: []string{"1.30", "1.29", "1.28", "1.27", "1.26", "1.25", "1.24"},
+			Choices: []string{"1.31", "1.30", "1.29", "1.28", "1.27", "1.26", "1.25", "1.24"},
 			Option:  &options.KubernetesVersion,
 		},
 		&cmd.BoolFlag{