From 13861360535fb5fa30f50475896117c565e3789a Mon Sep 17 00:00:00 2001
From: Richard Case <richard.case@outlook.com>
Date: Fri, 25 Oct 2024 15:29:11 +0100
Subject: [PATCH] fix: eks tests broken due to incorrect addon versions

This updates the addon versions used for the eks tests inline with
the updated k8s version for the created cluster.

Also update the IPv6 test to be more in line with the other tests.

Signed-off-by: Richard Case <richard.case@outlook.com>
---
 test/e2e/data/e2e_eks_conf.yaml               |  8 +++----
 .../cluster-template-eks-ipv6-cluster.yaml    | 23 -------------------
 test/e2e/suites/managed/eks_ipv6_test.go      |  7 ++++--
 3 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/test/e2e/data/e2e_eks_conf.yaml b/test/e2e/data/e2e_eks_conf.yaml
index 47b496d78d..44d486f6a5 100644
--- a/test/e2e/data/e2e_eks_conf.yaml
+++ b/test/e2e/data/e2e_eks_conf.yaml
@@ -126,11 +126,11 @@ variables:
   AWS_SSH_KEY_NAME: "cluster-api-provider-aws-sigs-k8s-io"
   EXP_EKS_IAM: "false"
   EXP_EKS_ADD_ROLES: "false"
-  VPC_ADDON_VERSION: "v1.16.2-eksbuild.1"
-  COREDNS_ADDON_VERSION: "v1.11.1-eksbuild.6"
+  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.29.0-eksbuild.2"
-  CONFORMANCE_CI_ARTIFACTS_KUBERNETES_VERSION: "1.29.1"
+  KUBE_PROXY_ADDON_VERSION: "v1.30.0-eksbuild.3"
+  CONFORMANCE_CI_ARTIFACTS_KUBERNETES_VERSION: "1.30.2"
   IP_FAMILY: "IPv4"
   CAPA_LOGLEVEL: "4"
   EXP_EXTERNAL_RESOURCE_GC: "true"
diff --git a/test/e2e/data/eks/cluster-template-eks-ipv6-cluster.yaml b/test/e2e/data/eks/cluster-template-eks-ipv6-cluster.yaml
index e2697c0200..ef89483426 100644
--- a/test/e2e/data/eks/cluster-template-eks-ipv6-cluster.yaml
+++ b/test/e2e/data/eks/cluster-template-eks-ipv6-cluster.yaml
@@ -54,26 +54,3 @@ spec:
   identityRef:
     kind: AWSClusterStaticIdentity
     name: e2e-account
----
-apiVersion: cluster.x-k8s.io/v1beta1
-kind: MachinePool
-metadata:
-  name: "${CLUSTER_NAME}-pool-0"
-spec:
-  clusterName: "${CLUSTER_NAME}"
-  replicas: ${WORKER_MACHINE_COUNT}
-  template:
-    spec:
-      clusterName: "${CLUSTER_NAME}"
-      bootstrap:
-        dataSecretName: ""
-      infrastructureRef:
-        name: "${CLUSTER_NAME}-pool-0"
-        apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
-        kind: AWSManagedMachinePool
----
-apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
-kind: AWSManagedMachinePool
-metadata:
-  name: "${CLUSTER_NAME}-pool-0"
-spec: {}
diff --git a/test/e2e/suites/managed/eks_ipv6_test.go b/test/e2e/suites/managed/eks_ipv6_test.go
index 00b13bc56f..891a34aa34 100644
--- a/test/e2e/suites/managed/eks_ipv6_test.go
+++ b/test/e2e/suites/managed/eks_ipv6_test.go
@@ -71,7 +71,7 @@ var _ = ginkgo.Describe("[managed] [general] [ipv6] EKS cluster tests", func() {
 				Namespace:                namespace,
 				ClusterName:              clusterName,
 				Flavour:                  EKSIPv6ClusterFlavor,
-				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,
 			}
 		})
@@ -85,8 +85,11 @@ var _ = ginkgo.Describe("[managed] [general] [ipv6] EKS cluster tests", func() {
 				AWSSession:            e2eCtx.BootstrapUserAWSSession,
 				Namespace:             namespace,
 				ClusterName:           clusterName,
+				IncludeScaling:        false,
+				Cleanup:               false,
 				ManagedMachinePool:    true,
-				Flavor:                EKSIPv6ClusterFlavor,
+				Flavor:                EKSManagedMachinePoolOnlyFlavor,
+				UsesLaunchTemplate:    false,
 			}
 		})