test: fix kind cluster test cleanup flakes (#1399)

kubernetes-sigs · Jul 8, 2024 · bcd33e9 · bcd33e9
1 parent 4d55a39
commit bcd33e9
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/hack/install-kwok.sh b/hack/install-kwok.sh
@@ -112,8 +112,8 @@ crdURL="https://github.com/${KWOK_REPO}/releases/download/${KWOK_RELEASE}/stage-
 # Set UNINSTALL_KWOK=true if you want to uninstall.
 if [[ ${UNINSTALL_KWOK} = "true" ]]
 then
-  kubectl delete -f ${HOME_DIR}/kwok.yaml
   kubectl delete -f ${crdURL}
+  kubectl delete -f ${HOME_DIR}/kwok.yaml
 else
   kubectl apply -f ${HOME_DIR}/kwok.yaml
   kubectl apply -f ${crdURL}

diff --git a/test/pkg/environment/common/setup.go b/test/pkg/environment/common/setup.go
@@ -135,7 +135,6 @@ func (env *Environment) CleanupObjects(cleanableObjects ...client.Object) {
 					defer GinkgoRecover()
 					g.Expect(env.ExpectTestingFinalizerRemoved(&metaList.Items[i])).To(Succeed())
 					g.Expect(client.IgnoreNotFound(env.Client.Delete(env, &metaList.Items[i],
-						client.PropagationPolicy(metav1.DeletePropagationForeground),
 						&client.DeleteOptions{GracePeriodSeconds: lo.ToPtr(int64(0))}))).To(Succeed())
 				})
 				// If the deletes eventually succeed, we should have no elements here at the end of the test