Skip to content
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

🌱fix: eks tests broken due to incorrect addon versions #5185

Merged
merged 1 commit into from
Oct 25, 2024
Merged

🌱fix: eks tests broken due to incorrect addon versions #5185

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
8 changes: 4 additions & 4 deletions test/e2e/data/e2e_eks_conf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
23 changes: 0 additions & 23 deletions test/e2e/data/eks/cluster-template-eks-ipv6-cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: {}
7 changes: 5 additions & 2 deletions test/e2e/suites/managed/eks_ipv6_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
})
Expand All @@ -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,
}
})

Expand Down