Merge pull request #30129 from dgoodwin/repair-inclusterapiserver-on-hcp

OCPBUGS-60530: Fix panics in inclusterapi disruption during  ROSA jobs

Author: sdodson

pkg/monitortests/kubeapiserver/disruptioninclusterapiserver/monitortest.go

@@ -312,6 +312,7 @@ func (i *InvariantInClusterDisruption) StartCollection(ctx context.Context, admi
 		_, hcpNamespace, err := exutil.GetHypershiftManagementClusterConfigAndNamespace()
 		if err != nil {
 			logrus.WithError(err).Error("failed to get hypershift management cluster config and namespace")
+			return err
 		}
 
 		// For Hypershift, only skip if it's specifically ARO HCP
@@ -351,6 +352,7 @@ func (i *InvariantInClusterDisruption) StartCollection(ctx context.Context, admi
 	i.adminRESTConfig = adminRESTConfig
 	i.kubeClient, err = kubernetes.NewForConfig(i.adminRESTConfig)
 	if err != nil {
+		log.WithError(err).Error("error constructing kube client in disruptionclusterapiserver monitortest")
 		return fmt.Errorf("error constructing kube client: %v", err)
 	}
 
@@ -497,6 +499,10 @@ func (i *InvariantInClusterDisruption) Cleanup(ctx context.Context) error {
 		return nil
 	}
 
+	if i.kubeClient == nil {
+		return nil
+	}
+
 	log.Infof("removing monitoring namespace")
 	nsClient := i.kubeClient.CoreV1().Namespaces()
 	err := nsClient.Delete(ctx, i.namespaceName, metav1.DeleteOptions{})

test/extended/util/client.go

@@ -226,6 +226,7 @@ func NewCLIForMonitorTest(project string) *CLI {
 // allowed inside an `It` block. `AfterEach` and `BeforeEach` are not allowed there though.
 func NewHypershiftManagementCLI(project string) *CLI {
 	kubeconfig, _, err := GetHypershiftManagementClusterConfigAndNamespace()
+	// TODO: this is assuming to be executing within ginkgo, which is not always the case (monitortests)
 	o.Expect(err).NotTo(o.HaveOccurred())
 	return &CLI{
 		kubeFramework: &framework.Framework{