From cf886726e529bc8d00e2b6bbe0d7e73500104208 Mon Sep 17 00:00:00 2001
From: Juan Manuel Parrilla Madrid <jparrill@redhat.com>
Date: Mon, 13 Jul 2026 16:18:02 +0200
Subject: [PATCH] fix(OCPBUGS-98464): handle stale DaemonSet in
 GlobalPullSecret test

The kubelet-config-verifier DaemonSet was created with a raw Create
call that failed with 409 AlreadyExists when a previous test run left
it behind (e.g., after a timeout before cleanup). The cleanup also
used g.Expect which could fail the test during teardown, preventing
resource removal.

Delete any stale DaemonSet before creating a new one, and move
cleanup to t.Cleanup so it always runs regardless of test outcome.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Signed-off-by: Juan Manuel Parrilla Madrid <jparrill@redhat.com>
---
 test/e2e/util/globalps.go | 56 +++++++++++++++++++++++++--------------
 1 file changed, 36 insertions(+), 20 deletions(-)

diff --git a/test/e2e/util/globalps.go b/test/e2e/util/globalps.go
index b598a34635d8..9311ddc333a0 100644
--- a/test/e2e/util/globalps.go
+++ b/test/e2e/util/globalps.go
@@ -26,7 +26,8 @@ const (
 )
 
 // CreateKubeletConfigVerifierDaemonSet creates a DaemonSet that verifies the config.json file
-// on all nodes of the cluster, comparing it with the cluster's pull secret
+// on all nodes of the cluster, comparing it with the cluster's pull secret.
+// Stale resources from a previous failed run are cleaned up before creation.
 func CreateKubeletConfigVerifierDaemonSet(ctx context.Context, guestClient crclient.Client, dsImage string) error {
 	// Get the cluster's pull secret for comparison
 	pullSecret := &corev1.Secret{}
@@ -50,6 +51,17 @@ func CreateKubeletConfigVerifierDaemonSet(ctx context.Context, guestClient crcli
 		}
 	}
 
+	// Clean up any stale DaemonSet left by a previous failed run
+	staleDS := &appsv1.DaemonSet{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      KubeletConfigVerifierDaemonSetName,
+			Namespace: KubeletConfigVerifierNamespace,
+		},
+	}
+	if err := guestClient.Delete(ctx, staleDS); err != nil && !apierrors.IsNotFound(err) {
+		return fmt.Errorf("failed to delete stale DaemonSet: %w", err)
+	}
+
 	daemonSet := &appsv1.DaemonSet{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      KubeletConfigVerifierDaemonSetName,
@@ -205,6 +217,29 @@ func CreateKubeletConfigVerifierDaemonSet(ctx context.Context, guestClient crcli
 func VerifyKubeletConfigWithDaemonSet(t *testing.T, ctx context.Context, guestClient crclient.Client, dsImage string, expectedNodeCount int32) {
 	g := NewWithT(t)
 
+	// Register cleanup first so it runs even if the test fails or times out
+	t.Cleanup(func() {
+		t.Log("Cleaning up kubelet config verifier resources")
+		ds := &appsv1.DaemonSet{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      KubeletConfigVerifierDaemonSetName,
+				Namespace: KubeletConfigVerifierNamespace,
+			},
+		}
+		if err := guestClient.Delete(ctx, ds); err != nil && !apierrors.IsNotFound(err) {
+			t.Logf("Warning: failed to clean up DaemonSet: %v", err)
+		}
+		secret := &corev1.Secret{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      "pull-secret",
+				Namespace: KubeletConfigVerifierNamespace,
+			},
+		}
+		if err := guestClient.Delete(ctx, secret); err != nil && !apierrors.IsNotFound(err) {
+			t.Logf("Warning: failed to clean up pull secret: %v", err)
+		}
+	})
+
 	// Create the DaemonSet
 	t.Log("Creating kubelet config verifier DaemonSet")
 	err := CreateKubeletConfigVerifierDaemonSet(ctx, guestClient, dsImage)
@@ -218,23 +253,4 @@ func VerifyKubeletConfigWithDaemonSet(t *testing.T, ctx context.Context, guestCl
 	konnectivityDS := hccomanifests.KonnectivityAgentDaemonSet()
 	g.Expect(waitForDaemonSetReady(t, ctx, guestClient, konnectivityDS.Name, konnectivityDS.Namespace, expectedNodeCount)).To(Succeed())
 	g.Expect(waitForDaemonSetReady(t, ctx, guestClient, KubeletConfigVerifierDaemonSetName, KubeletConfigVerifierNamespace, expectedNodeCount)).To(Succeed())
-
-	// Clean up the DaemonSet after verification
-	t.Log("Cleaning up kubelet config verifier DaemonSet")
-	daemonSet := &appsv1.DaemonSet{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      KubeletConfigVerifierDaemonSetName,
-			Namespace: KubeletConfigVerifierNamespace,
-		},
-	}
-	g.Expect(guestClient.Delete(ctx, daemonSet)).To(Succeed())
-
-	// Clean up pull-secret secret in kube-system namespace
-	pullSecret := &corev1.Secret{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      "pull-secret",
-			Namespace: KubeletConfigVerifierNamespace,
-		},
-	}
-	g.Expect(guestClient.Delete(ctx, pullSecret)).To(Succeed())
 }