From 331fe732b18f3aef1bedcea6b85612799ed45af7 Mon Sep 17 00:00:00 2001 From: Yike Wang Date: Fri, 20 Jan 2023 22:03:54 +0800 Subject: [PATCH] Fixes for gc related tests --- test/e2e/data/e2e_conf.yaml | 2 ++ test/e2e/data/e2e_eks_conf.yaml | 3 ++- test/e2e/suites/gc_managed/gc_managed_test.go | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/test/e2e/data/e2e_conf.yaml b/test/e2e/data/e2e_conf.yaml index b17cdbef2c..f7593fb81a 100644 --- a/test/e2e/data/e2e_conf.yaml +++ b/test/e2e/data/e2e_conf.yaml @@ -174,6 +174,8 @@ variables: INIT_WITH_KUBERNETES_VERSION: "v1.25.0" EXP_BOOTSTRAP_FORMAT_IGNITION: "true" EXP_KUBEADM_BOOTSTRAP_FORMAT_IGNITION: "true" + EXP_EXTERNAL_RESOURCE_GC: "true" + GC_WORKLOAD: "../../data/gcworkload.yaml" intervals: default/wait-cluster: ["30m", "10s"] diff --git a/test/e2e/data/e2e_eks_conf.yaml b/test/e2e/data/e2e_eks_conf.yaml index 9cecbcc4a8..5e7d9fba44 100644 --- a/test/e2e/data/e2e_eks_conf.yaml +++ b/test/e2e/data/e2e_eks_conf.yaml @@ -130,9 +130,10 @@ variables: COREDNS_ADDON_VERSION: "v1.8.7-eksbuild.3" KUBE_PROXY_ADDON_VERSION: "v1.24.7-eksbuild.2" CONFORMANCE_CI_ARTIFACTS_KUBERNETES_VERSION: "1.24.4" - AUTO_CONTROLLER_IDENTITY_CREATOR: "false" IP_FAMILY: "IPv4" CAPA_LOGLEVEL: "4" + EXP_EXTERNAL_RESOURCE_GC: "true" + GC_WORKLOAD: "../../data/gcworkload.yaml" intervals: default/wait-cluster: ["40m", "10s"] diff --git a/test/e2e/suites/gc_managed/gc_managed_test.go b/test/e2e/suites/gc_managed/gc_managed_test.go index 28b136041e..5fb3d4d0df 100644 --- a/test/e2e/suites/gc_managed/gc_managed_test.go +++ b/test/e2e/suites/gc_managed/gc_managed_test.go @@ -88,7 +88,7 @@ var _ = ginkgo.Describe("[managed] [gc] EKS Cluster external resource GC tests", cp := ms.GetControlPlaneByName(ctx, ms.GetControlPlaneByNameInput{ Getter: e2eCtx.Environment.BootstrapClusterProxy.GetClient(), Namespace: cluster.Spec.InfrastructureRef.Namespace, - Name: cluster.Spec.InfrastructureRef.Name, + Name: cluster.Spec.ControlPlaneRef.Name, }) ginkgo.By("Waiting for the machine pool to be running")