From e871b23470e5b9f08fac0f20249992491e551467 Mon Sep 17 00:00:00 2001 From: Nolan Brubaker Date: Thu, 5 Dec 2024 16:43:53 -0500 Subject: [PATCH] Remove CoreDNS from EKS addon tests While it may have worked in the past, CoreDNS no longer installs when there is just an EKS control plane. A user must also create a nodegroup for CoreDNS pods to be scheduled. Signed-off-by: Nolan Brubaker --- test/e2e/data/e2e_eks_conf.yaml | 2 -- ...late-eks-control-plane-only-withaddon.yaml | 4 --- test/e2e/suites/managed/eks_test.go | 25 ++++--------------- 3 files changed, 5 insertions(+), 26 deletions(-) diff --git a/test/e2e/data/e2e_eks_conf.yaml b/test/e2e/data/e2e_eks_conf.yaml index 46ef207093..66ea8936ef 100644 --- a/test/e2e/data/e2e_eks_conf.yaml +++ b/test/e2e/data/e2e_eks_conf.yaml @@ -127,8 +127,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" diff --git a/test/e2e/data/eks/cluster-template-eks-control-plane-only-withaddon.yaml b/test/e2e/data/eks/cluster-template-eks-control-plane-only-withaddon.yaml index 9108b38f3a..66ddf183a3 100644 --- a/test/e2e/data/eks/cluster-template-eks-control-plane-only-withaddon.yaml +++ b/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 diff --git a/test/e2e/suites/managed/eks_test.go b/test/e2e/suites/managed/eks_test.go index 39a1eaa150..df8ed36208 100644 --- a/test/e2e/suites/managed/eks_test.go +++ b/test/e2e/suites/managed/eks_test.go @@ -37,12 +37,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() { @@ -107,20 +106,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{