trt-2163: pass in oc to avoid ginkgo panics

Author: neisw

pkg/monitortests/kubeapiserver/disruptioninclusterapiserver/monitortest.go

@@ -318,7 +318,8 @@ func (i *InvariantInClusterDisruption) StartCollection(ctx context.Context, admi
 	log.Infof("payload image pull spec is %s", i.payloadImagePullSpec)
 
 	// Extract the openshift-tests image from the release payload
-	i.openshiftTestsImagePullSpec, err = extensions.ExtractImageFromReleasePayload(i.payloadImagePullSpec, "tests")
+	oc := exutil.NewCLIForMonitorTest("default")
+	i.openshiftTestsImagePullSpec, err = extensions.ExtractImageFromReleasePayload(i.payloadImagePullSpec, "tests", oc)
 	if err != nil {
 		return fmt.Errorf("unable to determine openshift-tests image: %s: %v", i.payloadImagePullSpec, err)
 	}

pkg/monitortests/network/disruptionpodnetwork/monitortest.go

@@ -91,14 +91,14 @@ func NewPodNetworkAvalibilityInvariant(info monitortestframework.MonitorTestInit
 func (pna *podNetworkAvalibility) PrepareCollection(ctx context.Context, adminRESTConfig *rest.Config, recorder monitorapi.RecorderWriter) error {
 	deploymentID := uuid.New().String()
 
-	openshiftTestsImagePullSpec, err := GetOpenshiftTestsImagePullSpec(ctx, adminRESTConfig, pna.payloadImagePullSpec, nil)
+	// Skip on ROSA TRT-1869
+	oc := util.NewCLIWithoutNamespace("openshift-tests")
+	openshiftTestsImagePullSpec, err := GetOpenshiftTestsImagePullSpec(ctx, adminRESTConfig, pna.payloadImagePullSpec, oc)
 	if err != nil {
 		pna.notSupportedReason = &monitortestframework.NotSupportedError{Reason: fmt.Sprintf("unable to determine openshift-tests image: %v", err)}
 		return pna.notSupportedReason
 	}
 
-	// Skip on ROSA TRT-1869
-	oc := util.NewCLIWithoutNamespace("openshift-tests")
 	isManagedServiceCluster, err := util.IsManagedServiceCluster(ctx, oc.AdminKubeClient())
 	if isManagedServiceCluster {
 		pna.notSupportedReason = &monitortestframework.NotSupportedError{Reason: fmt.Sprintf("pod network tests are unschedulable on ROSA TRT-1869")}

pkg/monitortests/network/disruptionpodnetwork/utils.go

@@ -33,7 +33,7 @@ func GetOpenshiftTestsImagePullSpec(ctx context.Context, adminRESTConfig *rest.C
 	// runImageExtract extracts src from specified image to dst
 
 	// Extract the openshift-tests image from the release payload
-	openshiftTestsImagePullSpec, err := extensions.ExtractImageFromReleasePayload(suggestedPayloadImage, "tests")
+	openshiftTestsImagePullSpec, err := extensions.ExtractImageFromReleasePayload(suggestedPayloadImage, "tests", oc)
 	if err != nil {
 		logrus.WithError(err).Errorf("unable to determine openshift-tests image through ExtractImageFromReleasePayload: %v", err)
 		// Now try the wrapper to see if it makes a difference

pkg/test/extensions/binary.go

@@ -426,7 +426,8 @@ func ExtractAllTestBinaries(ctx context.Context, parallelism int) (func(), TestB
 
 	defer os.RemoveAll(tmpDir)
 
-	registryAuthFilePath, err := DetermineRegistryAuthFilePath(tmpDir)
+	oc := exutil.NewCLIWithoutNamespace("default")
+	registryAuthFilePath, err := DetermineRegistryAuthFilePath(tmpDir, oc)
 	if err != nil {
 		return nil, nil, fmt.Errorf("failed to determine registry auth file path: %w", err)
 	}

pkg/test/extensions/util.go

@@ -273,15 +273,15 @@ func extractReleaseImageStream(extractPath, releaseImage string,
 
 // ExtractImageFromReleasePayload extracts the image pull spec for a specific tag from a release payload.
 // It returns the image pull spec for the specified tag or an error if the tag is not found.
-func ExtractImageFromReleasePayload(releaseImage, imageTag string) (string, error) {
+func ExtractImageFromReleasePayload(releaseImage, imageTag string, oc *util.CLI) (string, error) {
 	// Create a temporary directory for extraction
 	tmpDir, err := os.MkdirTemp("", "release-extract")
 	if err != nil {
 		return "", fmt.Errorf("failed to create temporary directory: %w", err)
 	}
 	defer os.RemoveAll(tmpDir)
 
-	registryAuthFilePath, err := DetermineRegistryAuthFilePath(tmpDir)
+	registryAuthFilePath, err := DetermineRegistryAuthFilePath(tmpDir, oc)
 	if err != nil {
 		return "", fmt.Errorf("failed to determine registry auth file path: %w", err)
 	}
@@ -302,9 +302,7 @@ func ExtractImageFromReleasePayload(releaseImage, imageTag string) (string, erro
 	return "", fmt.Errorf("image tag %q not found in release payload %q", imageTag, releaseImage)
 }
 
-func DetermineRegistryAuthFilePath(tmpDir string) (string, error) {
-	oc := util.NewCLIWithoutNamespace("default")
-
+func DetermineRegistryAuthFilePath(tmpDir string, oc *util.CLI) (string, error) {
 	// To extract binaries bearing external tests, we must inspect the release
 	// payload under tests as well as extract content from component images
 	// referenced by that payload.