Skip to content

🐛 fix: eks e2e with coredns addon #5269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

🐛 fix: eks e2e with coredns addon #5269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions test/e2e/data/eks/cluster-template-eks-control-plane-only-withaddon.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
27 changes: 6 additions & 21 deletions test/e2e/suites/managed/eks_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -71,7 +70,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,
}
})
Expand Down Expand Up @@ -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{
Expand Down
Loading