Merge pull request #30006 from bryan-cox/OCPBUGS-59218

OCPBUGS-59218: feat(azure): skip metrics collection for ARO HCP hypershift

Author: openshift-merge-bot[bot]

pkg/monitortests/kubeapiserver/disruptioninclusterapiserver/monitortest.go

@@ -303,6 +303,28 @@ func (i *InvariantInClusterDisruption) PrepareCollection(ctx context.Context, ad
 func (i *InvariantInClusterDisruption) StartCollection(ctx context.Context, adminRESTConfig *rest.Config, _ monitorapi.RecorderWriter) error {
 	var err error
 	log := logrus.WithField("monitorTest", "apiserver-incluster-availability").WithField("namespace", i.namespaceName).WithField("func", "StartCollection")
+
+	// Check for ARO HCP and skip if detected
+	oc := exutil.NewCLI("apiserver-incluster-availability").AsAdmin()
+	var isAROHCPcluster bool
+	isHypershift, _ := exutil.IsHypershift(ctx, oc.AdminConfigClient())
+	if isHypershift {
+		_, hcpNamespace, err := exutil.GetHypershiftManagementClusterConfigAndNamespace()
+		if err != nil {
+			logrus.WithError(err).Error("failed to get hypershift management cluster config and namespace")
+		}
+
+		// For Hypershift, only skip if it's specifically ARO HCP
+		// Use management cluster client to check the control-plane-operator deployment
+		managementOC := exutil.NewHypershiftManagementCLI(hcpNamespace)
+		if isAROHCPcluster, err = exutil.IsAroHCP(ctx, hcpNamespace, managementOC.AdminKubeClient()); err != nil {
+			logrus.WithError(err).Warning("Failed to check if ARO HCP, assuming it's not")
+		} else if isAROHCPcluster {
+			i.notSupportedReason = "platform Hypershift - ARO HCP not supported"
+			return nil
+		}
+	}
+
 	if len(i.payloadImagePullSpec) == 0 {
 		i.payloadImagePullSpec, err = extensions.DetermineReleasePayloadImage()
 		if err != nil {
@@ -319,7 +341,7 @@ 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
-	oc := exutil.NewCLIForMonitorTest("default")
+	oc = exutil.NewCLIForMonitorTest("default")
 	i.openshiftTestsImagePullSpec, err = payload.ExtractImageFromReleasePayload(i.payloadImagePullSpec, "tests", oc)
 	if err != nil {
 		return fmt.Errorf("unable to determine openshift-tests image: %s: %v", i.payloadImagePullSpec, err)

test/extended/util/managed_services.go

@@ -1,6 +1,13 @@
 package util
 
-import "k8s.io/apimachinery/pkg/util/sets"
+import (
+	"context"
+
+	"github.com/sirupsen/logrus"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/util/sets"
+	"k8s.io/client-go/kubernetes"
+)
 
 // ManagedServiceNamespaces is the set of namespaces used by managed service platforms
 // like ROSA, ARO, etc. These are typically exempt from the requirements we impose on
@@ -51,3 +58,40 @@ var ManagedServiceNamespaces = sets.New[string](
 	"openshift-validation-webhook",
 	"openshift-velero",
 )
+
+// IsAroHCP checks if the HyperShift operator deployment has MANAGED_SERVICE=ARO-HCP environment variable.
+func IsAroHCP(ctx context.Context, namespace string, kubeClient kubernetes.Interface) (bool, error) {
+	// List deployments with the correct label that actually exists on the deployment
+	deployments, err := kubeClient.AppsV1().Deployments(namespace).List(ctx, metav1.ListOptions{
+		LabelSelector: "hypershift.openshift.io/managed-by=control-plane-operator",
+	})
+	if err != nil {
+		logrus.Infof("Failed to list deployments in namespace %s: %v", namespace, err)
+		return false, nil // Not an error if we can't list deployments, just means it's not ARO HCP
+	}
+
+	if len(deployments.Items) == 0 {
+		logrus.Infof("No control-plane-operator deployments found in namespace %s", namespace)
+		return false, nil
+	}
+
+	logrus.Infof("Found %d control-plane-operator deployments in namespace %s", len(deployments.Items), namespace)
+
+	// Look through all matching deployments
+	for _, deployment := range deployments.Items {
+
+		// Look for the control-plane-operator container directly in the deployment spec
+		for _, container := range deployment.Spec.Template.Spec.Containers {
+			if container.Name == "control-plane-operator" {
+				logrus.Infof("Found container 'control-plane-operator' in deployment %s", deployment.Name)
+
+				result := HasEnvVar(&container, "MANAGED_SERVICE", "ARO-HCP")
+				logrus.Infof("hasEnvVar result for MANAGED_SERVICE=ARO-HCP: %v", result)
+				return result, nil
+			}
+		}
+	}
+
+	logrus.Infof("No deployment found with control-plane-operator container in namespace %s", namespace)
+	return false, nil
+}