Address CodeRabbit review: remove Docker Hub dependencies, use internal registry images, and capture original registry replicas in cleanup

Author: Chandan9112

test/extended/node/kubelet_secret_pulled_images.go

@@ -24,10 +24,10 @@ import (
 )
 
 const (
-	// credVerifyPublicImage is a publicly available image used in multi-tenancy tests
-	credVerifyPublicImage = "docker.io/library/nginx:alpine"
 	// internalRegistryPrefix is the OpenShift internal registry service address
 	internalRegistryPrefix = "image-registry.openshift-image-registry.svc:5000"
+	// credVerifyPublicImage is a cluster-hosted image accessible to all authenticated SAs
+	credVerifyPublicImage = internalRegistryPrefix + "/openshift/tools:latest"
 )
 
 var _ = g.Describe("[sig-node][Suite:openshift/disruptive-longrunning][Disruptive][OCPFeatureGate:KubeletEnsureSecretPulledImages][Serial]", g.Ordered, func() {
@@ -64,12 +64,13 @@ var _ = g.Describe("[sig-node][Suite:openshift/disruptive-longrunning][Disruptiv
 		workerNode = nodes[0].Name
 		e2e.Logf("Worker node: %s", workerNode)
 
-		// Import busybox into a namespace-scoped imagestream in the internal registry
+		// Tag the cluster-hosted openshift/tools image into a namespace-scoped imagestream
+		// so it becomes a "private" image requiring namespace-level pull credentials.
 		credVerifyEnsureNamespace(ctx, oc, sourceNS)
 		privateImage = fmt.Sprintf("%s/%s/test-image:latest", internalRegistryPrefix, sourceNS)
 
 		err = oc.AsAdmin().WithoutNamespace().Run("tag").Args(
-			"--source=docker", "docker.io/library/busybox:latest",
+			"openshift/tools:latest",
 			fmt.Sprintf("%s/test-image:latest", sourceNS),
 		).Execute()
 		o.Expect(err).NotTo(o.HaveOccurred())
@@ -248,10 +249,20 @@ var _ = g.Describe("[sig-node][Suite:openshift/disruptive-longrunning][Disruptiv
 		g.By("Caching private image then making the registry unavailable")
 		credVerifyRunPod(ctx, oc, credVerifyPod(ns, "pod-seed", privateImage, workerNode, corev1.PullIfNotPresent, "pull-secret"))
 
-		err := oc.AsAdmin().WithoutNamespace().Run("scale").Args("deployment/image-registry", "-n", "openshift-image-registry", "--replicas=0").Execute()
+		deploy, err := oc.AdminKubeClient().AppsV1().Deployments("openshift-image-registry").Get(ctx, "image-registry", metav1.GetOptions{})
+		o.Expect(err).NotTo(o.HaveOccurred())
+		originalReplicas := ptr.Deref(deploy.Spec.Replicas, int32(1))
+
+		err = oc.AsAdmin().WithoutNamespace().Run("scale").Args("deployment/image-registry", "-n", "openshift-image-registry", "--replicas=0").Execute()
 		o.Expect(err).NotTo(o.HaveOccurred())
 		g.DeferCleanup(func() {
-			_ = oc.AsAdmin().WithoutNamespace().Run("scale").Args("deployment/image-registry", "-n", "openshift-image-registry", "--replicas=2").Execute()
+			_ = oc.AsAdmin().WithoutNamespace().Run("scale").Args(
+				"deployment/image-registry", "-n", "openshift-image-registry",
+				fmt.Sprintf("--replicas=%d", originalReplicas),
+			).Execute()
+			_ = oc.AsAdmin().WithoutNamespace().Run("rollout").Args(
+				"status", "deployment/image-registry", "-n", "openshift-image-registry", "--timeout=2m",
+			).Execute()
 		})
 		err = oc.AsAdmin().WithoutNamespace().Run("rollout").Args("status", "deployment/image-registry", "-n", "openshift-image-registry", "--timeout=2m").Execute()
 		o.Expect(err).NotTo(o.HaveOccurred())