e2e: cluster infrastructure getter layer

Abstract from a specific way of getting information about a cluster.
Provide two ways of getting e.g. clusterplatform type.
Either by reading infrastructure.config.io/cluster object.
Or, be reading corresponding environment variables.

test/extended/apiserver/api_requests.go

@@ -96,7 +96,9 @@ var _ = g.Describe("[sig-arch][Late]", func() {
 		apirequestCountClient, err := apiserverclientv1.NewForConfig(oc.AdminConfig())
 		o.Expect(err).NotTo(o.HaveOccurred())
 
-		infra, err := oc.AdminConfigClient().ConfigV1().Infrastructures().Get(context.Background(), "cluster", metav1.GetOptions{})
+		platformType, err := exutil.ClusterInfrastructure(oc.AdminConfigClient()).PlatformType()
+		o.Expect(err).NotTo(o.HaveOccurred())
+		controlPlaneTopology, err := exutil.ClusterInfrastructure(oc.AdminConfigClient()).ControlPlaneTopology()
 		o.Expect(err).NotTo(o.HaveOccurred())
 
 		type platformUpperBound map[string]int64
@@ -320,16 +322,16 @@ var _ = g.Describe("[sig-arch][Late]", func() {
 
 		var upperBound platformUpperBound
 
-		if infra.Status.ControlPlaneTopology == configv1.SingleReplicaTopologyMode {
-			if _, exists := upperBoundsSingleNode[infra.Spec.PlatformSpec.Type]; !exists {
-				e2eskipper.Skipf("Unsupported single node platform type: %v", infra.Spec.PlatformSpec.Type)
+		if *controlPlaneTopology == configv1.SingleReplicaTopologyMode {
+			if _, exists := upperBoundsSingleNode[platformType]; !exists {
+				e2eskipper.Skipf("Unsupported single node platform type: %v", platformType)
 			}
-			upperBound = upperBoundsSingleNode[infra.Spec.PlatformSpec.Type]
+			upperBound = upperBoundsSingleNode[platformType]
 		} else {
-			if _, exists := upperBounds[infra.Spec.PlatformSpec.Type]; !exists {
-				e2eskipper.Skipf("Unsupported platform type: %v", infra.Spec.PlatformSpec.Type)
+			if _, exists := upperBounds[platformType]; !exists {
+				e2eskipper.Skipf("Unsupported platform type: %v", platformType)
 			}
-			upperBound = upperBounds[infra.Spec.PlatformSpec.Type]
+			upperBound = upperBounds[platformType]
 		}
 
 		apiRequestCounts, err := apirequestCountClient.APIRequestCounts().List(ctx, metav1.ListOptions{})
@@ -429,7 +431,7 @@ var _ = g.Describe("[sig-arch][Late]", func() {
 			allowedCount, exists := upperBound[operator]
 
 			if !exists {
-				framework.Logf("Operator %v not found in upper bounds for %v", operator, infra.Spec.PlatformSpec.Type)
+				framework.Logf("Operator %v not found in upper bounds for %v", operator, platformType)
 				framework.Logf("operator=%v, watchrequestcount=%v", item.operator, item.count)
 				continue
 			}

test/extended/apiserver/graceful_termination.go

@@ -145,7 +145,7 @@ var _ = g.Describe("[sig-api-machinery][Feature:APIServer][Late]", func() {
 	})
 
 	g.It("API LBs follow /readyz of kube-apiserver and stop sending requests before server shutdowns for external clients [apigroup:config.openshift.io]", func() {
-		controlPlaneTopology, err := exutil.GetControlPlaneTopology(oc)
+		controlPlaneTopology, err := exutil.ClusterInfrastructure(oc.AdminConfigClient()).ControlPlaneTopology()
 		o.Expect(err).NotTo(o.HaveOccurred())
 
 		// set up

test/extended/apiserver/kubeconfigs.go

@@ -33,7 +33,7 @@ var _ = g.Describe("[Conformance][sig-api-machinery][Feature:APIServer] local ku
 		kubeconfig := kc
 		g.It(fmt.Sprintf("%q should be present on all masters and work [apigroup:config.openshift.io]", kubeconfig), func() {
 			// external controlplane topology doesn't have master nodes
-			controlPlaneTopology, err := exutil.GetControlPlaneTopology(oc)
+			controlPlaneTopology, err := exutil.ClusterInfrastructure(oc.AdminConfigClient()).ControlPlaneTopology()
 			o.Expect(err).NotTo(o.HaveOccurred())
 			if *controlPlaneTopology == configv1.ExternalTopologyMode {
 				g.Skip("ExternalControlPlaneTopology doesn't have master node kubeconfigs")

test/extended/authentication/front_proxy.go

@@ -27,7 +27,7 @@ var _ = g.Describe("[sig-auth][Feature:Authentication] ", func() {
 
 	g.Describe("TestFrontProxy", func() {
 		g.It(fmt.Sprintf("should succeed [apigroup:config.openshift.io]"), func() {
-			controlPlaneTopology, err := exutil.GetControlPlaneTopology(oc)
+			controlPlaneTopology, err := exutil.ClusterInfrastructure(oc.AdminConfigClient()).ControlPlaneTopology()
 			o.Expect(err).NotTo(o.HaveOccurred())
 
 			if *controlPlaneTopology == configv1.ExternalTopologyMode {

test/extended/authorization/authorization.go

@@ -254,7 +254,7 @@ func (test resourceAccessReviewTest) run() {
 				}
 			}
 
-			controlPlaneTopology, err := exutil.GetControlPlaneTopology(test.ocClient)
+			controlPlaneTopology, err := exutil.ClusterInfrastructure(test.ocClient.AdminConfigClient()).ControlPlaneTopology()
 			o.Expect(err).NotTo(o.HaveOccurred())
 
 			// many operators installed in openshift- namespaces are allowed to read all namespaces.  We simply suppress all those users from the user slice
@@ -344,7 +344,7 @@ func (test localResourceAccessReviewTest) run() {
 				return false, nil
 			}
 
-			controlPlaneTopology, err := exutil.GetControlPlaneTopology(test.ocClient)
+			controlPlaneTopology, err := exutil.ClusterInfrastructure(test.ocClient.AdminConfigClient()).ControlPlaneTopology()
 			o.Expect(err).NotTo(o.HaveOccurred())
 
 			// many operators installed in openshift- namespaces are allowed to read all namespaces.  We simply suppress all those users from the user slice

test/extended/baremetal/common.go

@@ -19,10 +19,9 @@ import (
 func skipIfNotBaremetal(oc *exutil.CLI) {
 	g.By("checking platform type")
 
-	infra, err := oc.AdminConfigClient().ConfigV1().Infrastructures().Get(context.Background(), "cluster", metav1.GetOptions{})
+	platformType, err := exutil.ClusterInfrastructure(oc.AdminConfigClient()).PlatformType()
 	o.Expect(err).NotTo(o.HaveOccurred())
-
-	if infra.Status.PlatformStatus.Type != configv1.BareMetalPlatformType {
+	if platformType != configv1.BareMetalPlatformType {
 		e2eskipper.Skipf("No baremetal platform detected")
 	}
 }
@@ -35,10 +34,10 @@ func skipIfNotBaremetal(oc *exutil.CLI) {
 func skipIfUnsupportedPlatformOrConfig(oc *exutil.CLI, dc dynamic.Interface) {
 	g.By("checking supported platforms")
 
-	infra, err := oc.AdminConfigClient().ConfigV1().Infrastructures().Get(context.Background(), "cluster", metav1.GetOptions{})
+	platformType, err := exutil.ClusterInfrastructure(oc.AdminConfigClient()).PlatformType()
 	o.Expect(err).NotTo(o.HaveOccurred())
 
-	switch infra.Status.PlatformStatus.Type {
+	switch platformType {
 	case configv1.BareMetalPlatformType:
 		return
 	case configv1.OpenStackPlatformType:

test/extended/baremetal/hosts.go

@@ -14,7 +14,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-var _ = g.Describe("[sig-installer][Feature:baremetal] Baremetal/OpenStack/vSphere/None/AWS/GCP platforms [apigroup:config.openshift.io]", func() {
+var _ = g.Describe("[sig-installer][Feature:baremetal] Baremetal/OpenStack/vSphere/None/AWS/GCP platforms", func() {
 	defer g.GinkgoRecover()
 
 	var (
@@ -37,7 +37,7 @@ var _ = g.Describe("[sig-installer][Feature:baremetal] Baremetal/OpenStack/vSphe
 	})
 })
 
-var _ = g.Describe("[sig-installer][Feature:baremetal] Baremetal platform should [apigroup:config.openshift.io]", func() {
+var _ = g.Describe("[sig-installer][Feature:baremetal] Baremetal platform should", func() {
 	defer g.GinkgoRecover()
 
 	oc := exutil.NewCLI("baremetal")
@@ -147,7 +147,7 @@ var _ = g.Describe("[sig-installer][Feature:baremetal] Baremetal platform should
 
 // This block must be used for the serial tests. Any eventual extra worker deployed will be
 // automatically deleted during the AfterEach
-var _ = g.Describe("[sig-installer][Feature:baremetal][Serial] Baremetal platform should [apigroup:config.openshift.io]", func() {
+var _ = g.Describe("[sig-installer][Feature:baremetal][Serial] Baremetal platform should", func() {
 	defer g.GinkgoRecover()
 
 	var (

test/extended/ci/job_names.go

@@ -33,19 +33,18 @@ var _ = g.Describe("[sig-ci] [Early] prow job name", func() {
 	}
 	isPeriodic := strings.HasPrefix(jobName, "periodic-")
 
-	g.It("should match platform type [apigroup:config.openshift.io]", func() {
+	g.It("should match platform type", func() {
 		if jobName == "" {
 			e2eskipper.Skipf("JOB_NAME env var not set, skipping")
 		} else if strings.Contains(jobName, "agnostic") {
 			e2eskipper.Skipf("JOB_NAME contains agnostic, not expecting platform in name")
 		}
 
-		infra, err := oc.AdminConfigClient().ConfigV1().Infrastructures().Get(context.Background(), "cluster", metav1.GetOptions{})
+		platformType, err := exutil.ClusterInfrastructure(oc.AdminConfigClient()).PlatformType()
 		o.Expect(err).NotTo(o.HaveOccurred())
 
 		hasPlatform := true
-		platform := infra.Status.PlatformStatus.Type
-		switch platform {
+		switch platformType {
 		case v1.AlibabaCloudPlatformType:
 			if !strings.Contains(jobName, "alibaba") {
 				hasPlatform = false
@@ -55,13 +54,13 @@ var _ = g.Describe("[sig-ci] [Early] prow job name", func() {
 				hasPlatform = false
 			}
 		default:
-			if !strings.Contains(jobName, strings.ToLower(string(platform))) {
+			if !strings.Contains(jobName, strings.ToLower(string(platformType))) {
 				hasPlatform = false
 			}
 		}
 
 		if !hasPlatform {
-			result.Flakef("job name %q does not contain platform type in name (%s)", originalJobName, platform)
+			result.Flakef("job name %q does not contain platform type in name (%s)", originalJobName, platformType)
 		}
 
 	})
@@ -71,9 +70,9 @@ var _ = g.Describe("[sig-ci] [Early] prow job name", func() {
 			e2eskipper.Skipf("JOB_NAME env var not set, skipping")
 		}
 
-		network, err := oc.AdminConfigClient().ConfigV1().Networks().Get(context.Background(), "cluster", metav1.GetOptions{})
+		networkType, err := exutil.ClusterInfrastructure(oc.AdminConfigClient()).NetworkType()
 		o.Expect(err).NotTo(o.HaveOccurred())
-		switch network.Status.NetworkType {
+		switch networkType {
 		case "OpenShiftSDN":
 			if strings.Contains(jobName, "ovn") {
 				e2e.Failf("job name %q has mismatched network type in name (expected `sdn`, found `ovn`)", jobName)

test/extended/cli/explain.go

@@ -572,7 +572,7 @@ var _ = g.Describe("[sig-cli] oc explain", func() {
 	g.It("should contain proper spec+status for CRDs [apigroup:config.openshift.io]", func() {
 		crdClient := apiextensionsclientset.NewForConfigOrDie(oc.AdminConfig())
 		crdTypesTest := getCrdTypes(oc)
-		controlPlaneTopology, err := exutil.GetControlPlaneTopology(oc)
+		controlPlaneTopology, err := exutil.ClusterInfrastructure(oc.AdminConfigClient()).ControlPlaneTopology()
 		o.Expect(err).NotTo(o.HaveOccurred())
 		// External clusters are not expected to have 'autoscaling' or
 		// 'machine' Types, just the 'base' Types

test/extended/cli/mustgather.go

@@ -37,7 +37,7 @@ var _ = g.Describe("[sig-cli] oc adm must-gather", func() {
 	})
 
 	g.It("runs successfully [apigroup:config.openshift.io]", func() {
-		controlPlaneTopology, err := exutil.GetControlPlaneTopology(oc)
+		controlPlaneTopology, err := exutil.ClusterInfrastructure(oc.AdminConfigClient()).ControlPlaneTopology()
 		o.Expect(err).NotTo(o.HaveOccurred())
 		if *controlPlaneTopology == configv1.ExternalTopologyMode {
 			g.Skip("oc must-gather doesn't currently support external controlPlaneTopology")
@@ -102,7 +102,7 @@ var _ = g.Describe("[sig-cli] oc adm must-gather", func() {
 	})
 
 	g.It("runs successfully with options [apigroup:config.openshift.io]", func() {
-		controlPlaneTopology, err := exutil.GetControlPlaneTopology(oc)
+		controlPlaneTopology, err := exutil.ClusterInfrastructure(oc.AdminConfigClient()).ControlPlaneTopology()
 		o.Expect(err).NotTo(o.HaveOccurred())
 		if *controlPlaneTopology == configv1.ExternalTopologyMode {
 			g.Skip("oc must-gather doesn't currently support external controlPlaneTopology")
@@ -128,7 +128,7 @@ var _ = g.Describe("[sig-cli] oc adm must-gather", func() {
 
 	g.It("runs successfully for audit logs [apigroup:config.openshift.io][apigroup:oauth.openshift.io]", func() {
 		// On External clusters, events will not be part of the output, since audit logs do not include control plane logs.
-		controlPlaneTopology, err := exutil.GetControlPlaneTopology(oc)
+		controlPlaneTopology, err := exutil.ClusterInfrastructure(oc.AdminConfigClient()).ControlPlaneTopology()
 		o.Expect(err).NotTo(o.HaveOccurred())
 
 		if *controlPlaneTopology == configv1.ExternalTopologyMode {
@@ -302,7 +302,7 @@ var _ = g.Describe("[sig-cli] oc adm must-gather", func() {
 	g.When("looking at the audit logs", func() {
 		g.Describe("[sig-node] kubelet", func() {
 			g.It("runs apiserver processes strictly sequentially in order to not risk audit log corruption [apigroup:config.openshift.io]", func() {
-				controlPlaneTopology, err := exutil.GetControlPlaneTopology(oc)
+				controlPlaneTopology, err := exutil.ClusterInfrastructure(oc.AdminConfigClient()).ControlPlaneTopology()
 				o.Expect(err).NotTo(o.HaveOccurred())
 
 				// On External clusters, events will not be part of the output, since audit logs do not include control plane logs.

test/extended/cloud_controller_manager/ccm.go

@@ -21,10 +21,10 @@ var _ = g.Describe("[sig-cloud-provider][Feature:OpenShiftCloudControllerManager
 	oc := exutil.NewCLI("ccm")
 
 	g.It("Deploy an external cloud provider [apigroup:config.openshift.io][apigroup:machineconfiguration.openshift.io]", func() {
-		infra, err := oc.AdminConfigClient().ConfigV1().Infrastructures().Get(context.Background(), "cluster", metav1.GetOptions{})
+		platformType, err := exutil.ClusterInfrastructure(oc.AdminConfigClient()).PlatformType()
 		o.Expect(err).NotTo(o.HaveOccurred())
 
-		if infra.Status.PlatformStatus.Type != configv1.OpenStackPlatformType {
+		if platformType != configv1.OpenStackPlatformType {
 			g.Skip("Platform does not use external cloud provider")
 		}
 

test/extended/cmd/cmd.go

@@ -71,7 +71,7 @@ var _ = g.Describe("[sig-cli][Feature:LegacyCommandTests][Disruptive][Serial] te
 				}
 			}
 
-			infra, err := oc.AdminConfigClient().ConfigV1().Infrastructures().Get(context.Background(), "cluster", metav1.GetOptions{})
+			APIServerURL, err := exutil.ClusterInfrastructure(oc.AdminConfigClient()).APIServerURL()
 			o.Expect(err).NotTo(o.HaveOccurred())
 
 			log, errs := exutil.RunOneShotCommandPod(oc, "test-cmd", cliImageRef, "/var/tests/test/cmd/"+currFilename,
@@ -99,7 +99,7 @@ var _ = g.Describe("[sig-cli][Feature:LegacyCommandTests][Disruptive][Serial] te
 				},
 				[]corev1.EnvVar{
 					{Name: "KUBECONFIG_TESTS", Value: "/var/tests/kubeconfig/kubeconfig"},
-					{Name: "KUBERNETES_MASTER", Value: infra.Status.APIServerURL},
+					{Name: "KUBERNETES_MASTER", Value: APIServerURL},
 					{Name: "USER_TOKEN", Value: oc.UserConfig().BearerToken},
 					{Name: "TESTS_DIR", Value: "/var/tests/test/cmd"},
 					{Name: "TEST_NAME", Value: currFilename[0 : len(currFilename)-3]},

test/extended/csrapprover/csrapprover.go

@@ -38,7 +38,7 @@ var _ = g.Describe("[sig-cluster-lifecycle]", func() {
 	defer g.GinkgoRecover()
 
 	g.It("Pods cannot access the /config/master API endpoint [apigroup:config.openshift.io]", func() {
-		controlPlaneTopology, err := exutil.GetControlPlaneTopology(oc)
+		controlPlaneTopology, err := exutil.ClusterInfrastructure(oc.AdminConfigClient()).ControlPlaneTopology()
 		o.Expect(err).NotTo(o.HaveOccurred())
 
 		// https://issues.redhat.com/browse/CO-760
@@ -54,10 +54,10 @@ var _ = g.Describe("[sig-cluster-lifecycle]", func() {
 		o.Expect(err).NotTo(o.HaveOccurred())
 
 		// get the API server URL, mutate to internal API (use infra.Status.APIServerURLInternal) once API is bumped
-		infra, err := oc.AdminConfigClient().ConfigV1().Infrastructures().Get(context.Background(), "cluster", metav1.GetOptions{})
+		APIServerURL, err := exutil.ClusterInfrastructure(oc.AdminConfigClient()).APIServerURL()
 		o.Expect(err).NotTo(o.HaveOccurred())
 
-		internalAPI, err := url.Parse(infra.Status.APIServerURL)
+		internalAPI, err := url.Parse(APIServerURL)
 		o.Expect(err).NotTo(o.HaveOccurred())
 		internalAPI.Host = strings.Replace(internalAPI.Host, "api.", "api-int.", 1)
 
@@ -74,7 +74,7 @@ var _ = g.Describe("[sig-cluster-lifecycle]", func() {
 	})
 
 	g.It("CSRs from machines that are not recognized by the cloud provider are not approved [apigroup:config.openshift.io]", func() {
-		controlPlaneTopology, err := exutil.GetControlPlaneTopology(oc)
+		controlPlaneTopology, err := exutil.ClusterInfrastructure(oc.AdminConfigClient()).ControlPlaneTopology()
 		o.Expect(err).NotTo(o.HaveOccurred())
 
 		if *controlPlaneTopology == configv1.ExternalTopologyMode {

test/extended/etcd/etcd_test_runner.go

@@ -31,7 +31,7 @@ var _ = g.Describe("[sig-api-machinery] API data in etcd", func() {
 	oc := exutil.NewCLIWithPodSecurityLevel("etcd-storage-path", psapi.LevelBaseline).AsAdmin()
 
 	_ = g.It("should be stored at the correct location and version for all resources [Serial][apigroup:config.openshift.io]", func() {
-		controlPlaneTopology, err := exutil.GetControlPlaneTopology(oc)
+		controlPlaneTopology, err := exutil.ClusterInfrastructure(oc.AdminConfigClient()).ControlPlaneTopology()
 		o.Expect(err).NotTo(o.HaveOccurred())
 
 		if *controlPlaneTopology == configv1.ExternalTopologyMode {

test/extended/etcd/helpers/helpers.go

@@ -427,11 +427,11 @@ func MachineNameToEtcdMemberName(ctx context.Context, kubeClient kubernetes.Inte
 func InitPlatformSpecificConfiguration(oc *exutil.CLI) func() {
 	SkipIfUnsupportedPlatform(context.TODO(), oc)
 
-	infra, err := oc.AdminConfigClient().ConfigV1().Infrastructures().Get(context.Background(), "cluster", metav1.GetOptions{})
+	platformType, err := exutil.ClusterInfrastructure(oc.AdminConfigClient()).PlatformType()
 	o.Expect(err).NotTo(o.HaveOccurred())
 
 	// For baremetal platforms, an extra worker must be previously deployed to allow subsequent scaling operations
-	if infra.Status.PlatformStatus.Type == configv1.BareMetalPlatformType {
+	if platformType == configv1.BareMetalPlatformType {
 		dc, err := dynamic.NewForConfig(oc.KubeFramework().ClientConfig())
 		o.Expect(err).NotTo(o.HaveOccurred())
 
@@ -481,37 +481,37 @@ func skipUnlessFunctionalMachineAPI(ctx context.Context, machineClient machinev1
 }
 
 func skipIfAzure(oc *exutil.CLI) {
-	infra, err := oc.AdminConfigClient().ConfigV1().Infrastructures().Get(context.Background(), "cluster", metav1.GetOptions{})
+	platformType, err := exutil.ClusterInfrastructure(oc.AdminConfigClient()).PlatformType()
 	o.Expect(err).NotTo(o.HaveOccurred())
 
-	if infra.Status.PlatformStatus.Type == configv1.AzurePlatformType {
+	if platformType == configv1.AzurePlatformType {
 		e2eskipper.Skipf("this test is currently flaky on the azure platform")
 	}
 }
 
 func skipIfSingleNode(oc *exutil.CLI) {
-	infra, err := oc.AdminConfigClient().ConfigV1().Infrastructures().Get(context.Background(), "cluster", metav1.GetOptions{})
+	controlPlaneTopology, err := exutil.ClusterInfrastructure(oc.AdminConfigClient()).ControlPlaneTopology()
 	o.Expect(err).NotTo(o.HaveOccurred())
 
-	if infra.Status.ControlPlaneTopology == configv1.SingleReplicaTopologyMode {
+	if *controlPlaneTopology == configv1.SingleReplicaTopologyMode {
 		e2eskipper.Skipf("this test can be run only against an HA cluster, skipping it on an SNO env")
 	}
 }
 
 func skipIfBareMetal(oc *exutil.CLI) {
-	infra, err := oc.AdminConfigClient().ConfigV1().Infrastructures().Get(context.Background(), "cluster", metav1.GetOptions{})
+	platformType, err := exutil.ClusterInfrastructure(oc.AdminConfigClient()).PlatformType()
 	o.Expect(err).NotTo(o.HaveOccurred())
 
-	if infra.Status.PlatformStatus.Type == configv1.BareMetalPlatformType {
+	if platformType == configv1.BareMetalPlatformType {
 		e2eskipper.Skipf("this test is currently broken on the metal platform and needs to be fixed")
 	}
 }
 
 func skipIfVsphere(oc *exutil.CLI) {
-	infra, err := oc.AdminConfigClient().ConfigV1().Infrastructures().Get(context.Background(), "cluster", metav1.GetOptions{})
+	platformType, err := exutil.ClusterInfrastructure(oc.AdminConfigClient()).PlatformType()
 	o.Expect(err).NotTo(o.HaveOccurred())
 
-	if infra.Status.PlatformStatus.Type == configv1.VSpherePlatformType {
+	if platformType == configv1.VSpherePlatformType {
 		e2eskipper.Skipf("this test is currently broken on the vsphere platform and needs to be fixed (BZ2094919)")
 	}
 }

test/extended/etcd/leader_changes.go

@@ -25,7 +25,7 @@ var _ = g.Describe("[sig-etcd] etcd", func() {
 	})
 
 	g.It("leader changes are not excessive [Late][apigroup:config.openshift.io]", func() {
-		controlPlaneTopology, err := exutil.GetControlPlaneTopology(oc)
+		controlPlaneTopology, err := exutil.ClusterInfrastructure(oc.AdminConfigClient()).ControlPlaneTopology()
 		o.Expect(err).NotTo(o.HaveOccurred())
 		if *controlPlaneTopology == configv1.ExternalTopologyMode {
 			oc = exutil.NewHypershiftManagementCLI("default").AsAdmin().WithoutNamespace()

test/extended/etcd/vertical_scaling.go

@@ -18,7 +18,7 @@ import (
 	"k8s.io/kubernetes/test/e2e/framework"
 )
 
-var _ = g.Describe("[sig-etcd][Feature:EtcdVerticalScaling][Suite:openshift/etcd/scaling] etcd [apigroup:config.openshift.io]", func() {
+var _ = g.Describe("[sig-etcd][Feature:EtcdVerticalScaling][Suite:openshift/etcd/scaling] etcd", func() {
 	defer g.GinkgoRecover()
 	oc := exutil.NewCLIWithoutNamespace("etcd-scaling").AsAdmin()