Merge pull request #6704 from watany-dev/deprecated-v1.22

Remove support for EKS 1.22
eksctl-io · Jul 20, 2023 · 4aaa6ed · 4aaa6ed
2 parents b963046 + 601fb19
commit 4aaa6ed
Show file tree

Hide file tree

Showing 13 changed files with 41 additions and 415 deletions.
diff --git a/integration/tests/unowned_cluster/unowned_cluster_test.go b/integration/tests/unowned_cluster/unowned_cluster_test.go
@@ -47,8 +47,8 @@ func TestE2E(t *testing.T) {
 
 var (
 	stackName, ng1, mng1, mng2 string
-	version                    = "1.22"
-	upgradeVersion             = "1.23"
+	version                    = "1.23"
+	upgradeVersion             = "1.24"
 	ctl                        api.ClusterProvider
 	cfg                        *api.ClusterConfig
 )

diff --git a/pkg/actions/cluster/owned_test.go b/pkg/actions/cluster/owned_test.go
@@ -144,7 +144,7 @@ var _ = Describe("Delete", func() {
 					ClusterInfo: &eks.ClusterInfo{
 						Cluster: &ekstypes.Cluster{
 							Status:  ekstypes.ClusterStatusActive,
-							Version: aws.String("1.22"),
+							Version: aws.String("1.23"),
 						},
 					},
 				}
@@ -266,7 +266,7 @@ var _ = Describe("Delete", func() {
 					ClusterInfo: &eks.ClusterInfo{
 						Cluster: &ekstypes.Cluster{
 							Status:  ekstypes.ClusterStatusActive,
-							Version: aws.String("1.22"),
+							Version: aws.String("1.23"),
 						},
 					},
 				}

diff --git a/pkg/actions/cluster/upgrade_test.go b/pkg/actions/cluster/upgrade_test.go
@@ -35,15 +35,15 @@ var _ = Describe("upgrade cluster", func() {
 
 		Entry("upgrades by default when the version is not specified", upgradeCase{
 			givenVersion:           "",
-			eksVersion:             "1.22",
-			expectedUpgradeVersion: "1.23",
+			eksVersion:             "1.23",
+			expectedUpgradeVersion: "1.24",
 			expectedUpgrade:        true,
 		}),
 
 		Entry("upgrades by default when the version is auto", upgradeCase{
 			givenVersion:           "auto",
-			eksVersion:             "1.22",
-			expectedUpgradeVersion: "1.23",
+			eksVersion:             "1.23",
+			expectedUpgradeVersion: "1.24",
 			expectedUpgrade:        true,
 		}),
 
@@ -55,9 +55,9 @@ var _ = Describe("upgrade cluster", func() {
 		}),
 
 		Entry("upgrades to the next version when specified", upgradeCase{
-			givenVersion:           "1.22",
-			eksVersion:             "1.21",
-			expectedUpgradeVersion: "1.22",
+			givenVersion:           "1.23",
+			eksVersion:             "1.22",
+			expectedUpgradeVersion: "1.23",
 			expectedUpgrade:        true,
 		}),
 

diff --git a/pkg/actions/fargate/create_test.go b/pkg/actions/fargate/create_test.go
@@ -64,7 +64,7 @@ var _ = Describe("Fargate", func() {
 			ClusterInfo: &eks.ClusterInfo{
 				Cluster: &ekstypes.Cluster{
 					Status:  ekstypes.ClusterStatusActive,
-					Version: aws.String("1.22"),
+					Version: aws.String("1.23"),
 				},
 			},
 		}}

diff --git a/pkg/actions/nodegroup/get_test.go b/pkg/actions/nodegroup/get_test.go
@@ -407,7 +407,7 @@ var _ = Describe("Get", func() {
 					},
 					Status: corev1.NodeStatus{
 						NodeInfo: corev1.NodeSystemInfo{
-							KubeletVersion: "1.22.1",
+							KubeletVersion: "1.23.1",
 						},
 					},
 				}, metav1.CreateOptions{})
@@ -468,7 +468,7 @@ var _ = Describe("Get", func() {
 					MaxSize:              100,
 					DesiredCapacity:      50,
 					MinSize:              1,
-					Version:              "1.22.1",
+					Version:              "1.23.1",
 					CreationTime:         creationTime,
 					NodeGroupType:        api.NodeGroupTypeUnmanaged,
 				}))