fix(disruption): Using correct internal LB monitor on ARO Hypershift

    The internal load balancer monitor used default LB config for ARO Hypershift is not applicable to Hypershift
    clusters and causes test failures. This change uses internal LB with specific settings(7743 port) to the deployment
    of the internal LB monitor on ARO Hypershift.

Author: wangke19

pkg/monitortests/kubeapiserver/disruptioninclusterapiserver/monitortest.go

@@ -75,6 +75,9 @@ type InvariantInClusterDisruption struct {
 	replicas                    int32
 	controlPlaneNodes           int32
 
+	isHypershift    bool
+	isAROHCPCluster bool
+
 	adminRESTConfig *rest.Config
 	kubeClient      kubernetes.Interface
 }
@@ -113,7 +116,7 @@ func (i *InvariantInClusterDisruption) createDeploymentAndWaitToRollout(ctx cont
 	return nil
 }
 
-func (i *InvariantInClusterDisruption) createInternalLBDeployment(ctx context.Context, apiIntHost string) error {
+func (i *InvariantInClusterDisruption) createInternalLBDeployment(ctx context.Context, apiIntHost, apiIntPort string) error {
 	deploymentObj := resourceread.ReadDeploymentV1OrDie(internalLBDeploymentYaml)
 	deploymentObj.SetNamespace(i.namespaceName)
 	deploymentObj.Spec.Template.Spec.Containers[0].Env[0].Value = apiIntHost
@@ -122,6 +125,18 @@ func (i *InvariantInClusterDisruption) createInternalLBDeployment(ctx context.Co
 	// we need to use the openshift-tests image of the destination during an upgrade.
 	deploymentObj.Spec.Template.Spec.Containers[0].Image = i.openshiftTestsImagePullSpec
 
+	// Set the correct port for internal API server
+	for j, env := range deploymentObj.Spec.Template.Spec.Containers[0].Env {
+		if env.Name == "KUBERNETES_SERVICE_PORT" {
+			if i.isHypershift && i.isAROHCPCluster {
+				deploymentObj.Spec.Template.Spec.Containers[0].Env[j].Value = "7443"
+			} else {
+				deploymentObj.Spec.Template.Spec.Containers[0].Env[j].Value = apiIntPort
+			}
+			break
+		}
+	}
+
 	err := i.createDeploymentAndWaitToRollout(ctx, deploymentObj)
 	if err != nil {
 		return err
@@ -304,25 +319,21 @@ func (i *InvariantInClusterDisruption) StartCollection(ctx context.Context, admi
 	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
+	// Check for Hypershift and ARO HCP
 	oc := exutil.NewCLI("apiserver-incluster-availability").AsAdmin()
-	var isAROHCPcluster bool
-	isHypershift, _ := exutil.IsHypershift(ctx, oc.AdminConfigClient())
-	if isHypershift {
+	i.isHypershift, _ = exutil.IsHypershift(ctx, oc.AdminConfigClient())
+	if i.isHypershift {
 		_, 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
-		// 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 {
+		i.isAROHCPCluster, err = exutil.IsAroHCP(ctx, hcpNamespace, managementOC.AdminKubeClient())
+		if 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
+			i.isAROHCPCluster = false // Assume not ARO HCP on error
 		}
 	}
 
@@ -378,11 +389,31 @@ func (i *InvariantInClusterDisruption) StartCollection(ctx context.Context, admi
 		return fmt.Errorf("error getting openshift infrastructure: %v", err)
 	}
 
-	internalAPI, err := url.Parse(infra.Status.APIServerInternalURL)
-	if err != nil {
-		return fmt.Errorf("error parsing api int url: %v", err)
+	var apiIntHost string
+	var apiIntPort string
+	if i.isHypershift {
+		parsedURL, err := url.Parse(i.adminRESTConfig.Host)
+		if err != nil {
+			return fmt.Errorf("failed to parse adminRESTConfig.Host %q: %v", i.adminRESTConfig.Host, err)
+		}
+		apiIntHost = parsedURL.Hostname()
+		if parsedURL.Port() != "" {
+			apiIntPort = parsedURL.Port()
+		} else {
+			apiIntPort = "6443" // default port
+		}
+	} else {
+		internalAPI, err := url.Parse(infra.Status.APIServerInternalURL)
+		if err != nil {
+			return fmt.Errorf("error parsing api int url: %v", err)
+		}
+		apiIntHost = internalAPI.Hostname()
+		if internalAPI.Port() != "" {
+			apiIntPort = internalAPI.Port()
+		} else {
+			apiIntPort = "6443" // default port
+		}
 	}
-	apiIntHost := internalAPI.Hostname()
 
 	allNodes, err := i.kubeClient.CoreV1().Nodes().List(ctx, metav1.ListOptions{})
 	if err != nil {
@@ -438,7 +469,7 @@ func (i *InvariantInClusterDisruption) StartCollection(ctx context.Context, admi
 	if err != nil {
 		return fmt.Errorf("error creating localhost: %v", err)
 	}
-	err = i.createInternalLBDeployment(ctx, apiIntHost)
+	err = i.createInternalLBDeployment(ctx, apiIntHost, apiIntPort)
 	if err != nil {
 		return fmt.Errorf("error creating internal LB: %v", err)
 	}