Merge pull request #3999 from wyike/gc_test

Fixes for gc related tests
kubernetes-sigs · Jan 30, 2023 · 4140e60 · 4140e60
2 parents 1c81e66 + 331fe73
commit 4140e60
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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")