fix: e2e changes to remove v1.23

This changes the EKS upgrade test to use a newer version of Kubernetes.
It was using v1.23 which isn't supported.

Removed old CSI tests as they where testing upgrades to v1.23
for unmanaged clusters.

Removed references to CoreDNS addon in EKS tests.

Signed-off-by: Richard Case <[email protected]>

Author: richardcase

test/e2e/data/e2e_conf.yaml

@@ -180,9 +180,6 @@ variables:
   KUBERNETES_VERSION: "v1.29.9"
   KUBERNETES_VERSION_UPGRADE_TO: "v1.29.9"
   KUBERNETES_VERSION_UPGRADE_FROM: "v1.29.8"
-  # Pre and post 1.23 Kubernetes versions are being used for CSI upgrade tests
-  PRE_1_23_KUBERNETES_VERSION: "v1.22.17"
-  POST_1_23_KUBERNETES_VERSION: "v1.23.15"
   CNI: "../../data/cni/calico.yaml"
   KUBETEST_CONFIGURATION: "../../data/kubetest/conformance.yaml"
   EVENT_BRIDGE_INSTANCE_STATE: "true"

test/e2e/data/e2e_eks_conf.yaml

@@ -16,7 +16,7 @@ images:
   - name: gcr.io/k8s-staging-cluster-api/capa-manager:e2e
     loadBehavior: mustLoad
 
-## PLEASE KEEP THESE UP TO DATE WITH THE COMPONENTS
+  ## PLEASE KEEP THESE UP TO DATE WITH THE COMPONENTS
   - name: quay.io/jetstack/cert-manager-cainjector:v1.15.1
     loadBehavior: tryLoad
   - name: quay.io/jetstack/cert-manager-webhook:v1.15.1
@@ -118,6 +118,8 @@ providers:
 variables:
   KUBERNETES_VERSION: "v1.30.2"
   KUBERNETES_VERSION_MANAGEMENT: "v1.30.0" # Kind bootstrap
+  UPGRADE_FROM_VERSION: "v1.30.0"
+  UPGRADE_TO_VERSION: "v1.31.0"
   EXP_MACHINE_POOL: "true"
   EXP_CLUSTER_RESOURCE_SET: "true"
   EVENT_BRIDGE_INSTANCE_STATE: "true"
@@ -127,8 +129,6 @@ variables:
   EXP_EKS_IAM: "false"
   EXP_EKS_ADD_ROLES: "false"
   VPC_ADDON_VERSION: "v1.18.1-eksbuild.3"
-  COREDNS_ADDON_VERSION: "v1.11.1-eksbuild.8"
-  COREDNS_ADDON_CONFIGURATION: '{"replicaCount":3}'
   KUBE_PROXY_ADDON_VERSION: "v1.30.0-eksbuild.3"
   CONFORMANCE_CI_ARTIFACTS_KUBERNETES_VERSION: "1.30.2"
   IP_FAMILY: "IPv4"

test/e2e/data/eks/cluster-template-eks-control-plane-only-withaddon.yaml

@@ -40,10 +40,6 @@ spec:
     - name: "vpc-cni"
       version: "${VPC_ADDON_VERSION}"
       conflictResolution: "overwrite"
-    - name: "coredns"
-      version: "${COREDNS_ADDON_VERSION}"
-      conflictResolution: "overwrite"
-      configuration: '${COREDNS_ADDON_CONFIGURATION}'
   identityRef:
     kind: AWSClusterStaticIdentity
     name: e2e-account

test/e2e/data/eks/cluster-template-eks-ipv6-cluster.yaml

@@ -45,9 +45,6 @@ spec:
     - name: "vpc-cni"
       version: "${VPC_ADDON_VERSION}"
       conflictResolution: "overwrite"
-    - name: "coredns"
-      version: "${COREDNS_ADDON_VERSION}"
-      conflictResolution: "overwrite"
     - name: "kube-proxy"
       version: "${KUBE_PROXY_ADDON_VERSION}"
       conflictResolution: "overwrite"

test/e2e/shared/defaults.go

@@ -43,8 +43,6 @@ const (
 	CNIPath                              = "CNI"
 	CNIResources                         = "CNI_RESOURCES"
 	CNIAddonVersion                      = "VPC_ADDON_VERSION"
-	CorednsAddonVersion                  = "COREDNS_ADDON_VERSION"
-	CorednsAddonConfiguration            = "COREDNS_ADDON_CONFIGURATION"
 	GcWorkloadPath                       = "GC_WORKLOAD"
 	KubeproxyAddonVersion                = "KUBE_PROXY_ADDON_VERSION"
 	AwsNodeMachineType                   = "AWS_NODE_MACHINE_TYPE"
@@ -66,11 +64,11 @@ const (
 	StorageClassOutTreeZoneLabel         = "topology.ebs.csi.aws.com/zone"
 	GPUFlavor                            = "gpu"
 	InstanceVcpu                         = "AWS_MACHINE_TYPE_VCPU_USAGE"
-	PreCSIKubernetesVer                  = "PRE_1_23_KUBERNETES_VERSION"
-	PostCSIKubernetesVer                 = "POST_1_23_KUBERNETES_VERSION"
 	EFSSupport                           = "efs-support"
 	IntreeCloudProvider                  = "intree-cloud-provider"
 	MultiTenancy                         = "MULTI_TENANCY_"
+	EksUpgradeFromVersion                = "UPGRADE_FROM_VERSION"
+	EksUpgradeToVersion                  = "UPGRADE_TO_VERSION"
 )
 
 // ResourceQuotaFilePath is the path to the file that contains the resource usage.

test/e2e/suites/managed/eks_ipv6_test.go

@@ -51,7 +51,6 @@ var _ = ginkgo.Describe("[managed] [general] [ipv6] EKS cluster tests", func() {
 		Expect(e2eCtx.E2EConfig).ToNot(BeNil(), "Invalid argument. e2eConfig can't be nil when calling %s spec", specName)
 		Expect(e2eCtx.E2EConfig.Variables).To(HaveKey(shared.KubernetesVersion))
 		Expect(e2eCtx.E2EConfig.Variables).To(HaveKey(shared.CNIAddonVersion))
-		Expect(e2eCtx.E2EConfig.Variables).To(HaveKey(shared.CorednsAddonVersion))
 		Expect(e2eCtx.E2EConfig.Variables).To(HaveKey(shared.KubeproxyAddonVersion))
 
 		ctx = context.TODO()

test/e2e/suites/managed/eks_legacy_test.go

@@ -50,7 +50,6 @@ var _ = ginkgo.Describe("[managed] [legacy] EKS cluster tests - single kind", fu
 		Expect(e2eCtx.E2EConfig).ToNot(BeNil(), "Invalid argument. e2eConfig can't be nil when calling %s spec", specName)
 		Expect(e2eCtx.E2EConfig.Variables).To(HaveKey(shared.KubernetesVersion))
 		Expect(e2eCtx.E2EConfig.Variables).To(HaveKey(shared.CNIAddonVersion))
-		Expect(e2eCtx.E2EConfig.Variables).To(HaveKey(shared.CorednsAddonVersion))
 		Expect(e2eCtx.E2EConfig.Variables).To(HaveKey(shared.KubeproxyAddonVersion))
 
 		ctx = context.TODO()
@@ -71,7 +70,7 @@ var _ = ginkgo.Describe("[managed] [legacy] EKS cluster tests - single kind", fu
 				Namespace:                namespace,
 				ClusterName:              clusterName,
 				Flavour:                  EKSControlPlaneOnlyLegacyFlavor,
-				ControlPlaneMachineCount: 1, //NOTE: this cannot be zero as clusterctl returns an error
+				ControlPlaneMachineCount: 1, // NOTE: this cannot be zero as clusterctl returns an error
 				WorkerMachineCount:       0,
 			}
 		})

test/e2e/suites/managed/eks_test.go

@@ -36,12 +36,11 @@ import (
 // General EKS e2e test.
 var _ = ginkgo.Describe("[managed] [general] EKS cluster tests", func() {
 	var (
-		namespace        *corev1.Namespace
-		ctx              context.Context
-		specName         = "cluster"
-		clusterName      string
-		cniAddonName     = "vpc-cni"
-		corednsAddonName = "coredns"
+		namespace    *corev1.Namespace
+		ctx          context.Context
+		specName     = "cluster"
+		clusterName  string
+		cniAddonName = "vpc-cni"
 	)
 
 	shared.ConditionalIt(runGeneralTests, "should create a cluster and add nodes", func() {
@@ -50,7 +49,6 @@ var _ = ginkgo.Describe("[managed] [general] EKS cluster tests", func() {
 		Expect(e2eCtx.E2EConfig).ToNot(BeNil(), "Invalid argument. e2eConfig can't be nil when calling %s spec", specName)
 		Expect(e2eCtx.E2EConfig.Variables).To(HaveKey(shared.KubernetesVersion))
 		Expect(e2eCtx.E2EConfig.Variables).To(HaveKey(shared.CNIAddonVersion))
-		Expect(e2eCtx.E2EConfig.Variables).To(HaveKey(shared.CorednsAddonVersion))
 
 		ctx = context.TODO()
 		namespace = shared.SetupSpecNamespace(ctx, specName, e2eCtx)
@@ -70,7 +68,7 @@ var _ = ginkgo.Describe("[managed] [general] EKS cluster tests", func() {
 				Namespace:                namespace,
 				ClusterName:              clusterName,
 				Flavour:                  EKSControlPlaneOnlyWithAddonFlavor,
-				ControlPlaneMachineCount: 1, //NOTE: this cannot be zero as clusterctl returns an error
+				ControlPlaneMachineCount: 1, // NOTE: this cannot be zero as clusterctl returns an error
 				WorkerMachineCount:       0,
 			}
 		})
@@ -99,20 +97,6 @@ var _ = ginkgo.Describe("[managed] [general] EKS cluster tests", func() {
 			}
 		})
 
-		ginkgo.By("should have the Coredns addon installed")
-		CheckAddonExistsSpec(ctx, func() CheckAddonExistsSpecInput {
-			return CheckAddonExistsSpecInput{
-				E2EConfig:             e2eCtx.E2EConfig,
-				BootstrapClusterProxy: e2eCtx.Environment.BootstrapClusterProxy,
-				AWSSession:            e2eCtx.BootstrapUserAWSSession,
-				Namespace:             namespace,
-				ClusterName:           clusterName,
-				AddonName:             corednsAddonName,
-				AddonVersion:          e2eCtx.E2EConfig.GetVariable(shared.CorednsAddonVersion),
-				AddonConfiguration:    e2eCtx.E2EConfig.GetVariable(shared.CorednsAddonConfiguration),
-			}
-		})
-
 		ginkgo.By("should create a MachineDeployment")
 		MachineDeploymentSpec(ctx, func() MachineDeploymentSpecInput {
 			return MachineDeploymentSpecInput{

test/e2e/suites/managed/upgrade_test.go

@@ -35,27 +35,29 @@ import (
 
 // EKS cluster upgrade tests.
 var _ = ginkgo.Describe("EKS Cluster upgrade test", func() {
-	const (
-		initialVersion   = "v1.23.6"
-		upgradeToVersion = "v1.24.4"
-	)
 	var (
-		namespace   *corev1.Namespace
-		ctx         context.Context
-		specName    = "eks-upgrade"
-		clusterName string
+		namespace        *corev1.Namespace
+		ctx              context.Context
+		specName         = "eks-upgrade"
+		clusterName      string
+		initialVersion   string
+		upgradeToVersion string
 	)
 
 	shared.ConditionalIt(runUpgradeTests, "[managed] [upgrade] should create a cluster and upgrade the kubernetes version", func() {
 		ginkgo.By("should have a valid test configuration")
 		Expect(e2eCtx.Environment.BootstrapClusterProxy).ToNot(BeNil(), "Invalid argument. BootstrapClusterProxy can't be nil")
 		Expect(e2eCtx.E2EConfig).ToNot(BeNil(), "Invalid argument. e2eConfig can't be nil when calling %s spec", specName)
-		Expect(e2eCtx.E2EConfig.Variables).To(HaveKey(shared.KubernetesVersion))
+		Expect(e2eCtx.E2EConfig.Variables).To(HaveKey(shared.EksUpgradeFromVersion))
+		Expect(e2eCtx.E2EConfig.Variables).To(HaveKey(shared.EksUpgradeToVersion))
 
 		ctx = context.TODO()
 		namespace = shared.SetupSpecNamespace(ctx, specName, e2eCtx)
 		clusterName = fmt.Sprintf("%s-%s", specName, util.RandomString(6))
 
+		initialVersion = e2eCtx.E2EConfig.GetVariable(shared.EksUpgradeFromVersion)
+		upgradeToVersion = e2eCtx.E2EConfig.GetVariable(shared.EksUpgradeToVersion)
+
 		ginkgo.By("default iam role should exist")
 		VerifyRoleExistsAndOwned(ekscontrolplanev1.DefaultEKSControlPlaneRole, clusterName, false, e2eCtx.BootstrapUserAWSSession)