Skip to content

Commit 0b6b8a6

Browse files
authored
Merge pull request #5239 from nrb/fix-5237
🌱 Remove invalid EKS test
2 parents a39c3d0 + e871b23 commit 0b6b8a6

File tree

3 files changed

+5
-26
lines changed

3 files changed

+5
-26
lines changed

test/e2e/data/e2e_eks_conf.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,6 @@ variables:
127127
EXP_EKS_IAM: "false"
128128
EXP_EKS_ADD_ROLES: "false"
129129
VPC_ADDON_VERSION: "v1.18.1-eksbuild.3"
130-
COREDNS_ADDON_VERSION: "v1.11.1-eksbuild.8"
131-
COREDNS_ADDON_CONFIGURATION: '{"replicaCount":3}'
132130
KUBE_PROXY_ADDON_VERSION: "v1.30.0-eksbuild.3"
133131
CONFORMANCE_CI_ARTIFACTS_KUBERNETES_VERSION: "1.30.2"
134132
IP_FAMILY: "IPv4"

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

-4
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,6 @@ spec:
4040
- name: "vpc-cni"
4141
version: "${VPC_ADDON_VERSION}"
4242
conflictResolution: "overwrite"
43-
- name: "coredns"
44-
version: "${COREDNS_ADDON_VERSION}"
45-
conflictResolution: "overwrite"
46-
configuration: '${COREDNS_ADDON_CONFIGURATION}'
4743
identityRef:
4844
kind: AWSClusterStaticIdentity
4945
name: e2e-account

test/e2e/suites/managed/eks_test.go

+5-20
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,11 @@ import (
3737
// General EKS e2e test.
3838
var _ = ginkgo.Describe("[managed] [general] EKS cluster tests", func() {
3939
var (
40-
namespace *corev1.Namespace
41-
ctx context.Context
42-
specName = "cluster"
43-
clusterName string
44-
cniAddonName = "vpc-cni"
45-
corednsAddonName = "coredns"
40+
namespace *corev1.Namespace
41+
ctx context.Context
42+
specName = "cluster"
43+
clusterName string
44+
cniAddonName = "vpc-cni"
4645
)
4746

4847
shared.ConditionalIt(runGeneralTests, "should create a cluster and add nodes", func() {
@@ -107,20 +106,6 @@ var _ = ginkgo.Describe("[managed] [general] EKS cluster tests", func() {
107106
}
108107
})
109108

110-
ginkgo.By("should have the Coredns addon installed")
111-
CheckAddonExistsSpec(ctx, func() CheckAddonExistsSpecInput {
112-
return CheckAddonExistsSpecInput{
113-
E2EConfig: e2eCtx.E2EConfig,
114-
BootstrapClusterProxy: e2eCtx.Environment.BootstrapClusterProxy,
115-
AWSSession: e2eCtx.BootstrapUserAWSSession,
116-
Namespace: namespace,
117-
ClusterName: clusterName,
118-
AddonName: corednsAddonName,
119-
AddonVersion: e2eCtx.E2EConfig.GetVariable(shared.CorednsAddonVersion),
120-
AddonConfiguration: e2eCtx.E2EConfig.GetVariable(shared.CorednsAddonConfiguration),
121-
}
122-
})
123-
124109
ginkgo.By("should create a MachineDeployment")
125110
MachineDeploymentSpec(ctx, func() MachineDeploymentSpecInput {
126111
return MachineDeploymentSpecInput{

0 commit comments

Comments
 (0)