Merge pull request #1297 from neisw/revert-1279-rewrite-46922

Revert "OTA-1604: migrate ocp-46922 from otp to cvo repo"

Author: openshift-merge-bot[bot]

.openshift-tests-extension/openshift_payload_cluster-version-operator.json

@@ -18,15 +18,5 @@
     "source": "openshift:payload:cluster-version-operator",
     "lifecycle": "blocking",
     "environmentSelector": {}
-  },
-  {
-    "name": "[Jira:\"Cluster Version Operator\"] cluster-version-operator should have correct runlevel and scc",
-    "labels": {},
-    "resources": {
-      "isolation": {}
-    },
-    "source": "openshift:payload:cluster-version-operator",
-    "lifecycle": "blocking",
-    "environmentSelector": {}
   }
 ]

test/cvo/cvo.go

@@ -1,12 +1,6 @@
 package cvo
 
 import (
-	"context"
-
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/client-go/kubernetes"
-	"k8s.io/client-go/rest"
-
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
@@ -16,8 +10,6 @@ import (
 
 var logger = GinkgoLogr.WithName("cluster-version-operator-tests")
 
-const cvoNamespace = "openshift-cluster-version"
-
 var _ = Describe(`[Jira:"Cluster Version Operator"] cluster-version-operator-tests`, func() {
 	It("should support passing tests", func() {
 		Expect(true).To(BeTrue())
@@ -33,49 +25,3 @@ var _ = Describe(`[Jira:"Cluster Version Operator"] cluster-version-operator-tes
 		Expect(output).To(ContainSubstring("Client Version:"))
 	})
 })
-
-// CVO tests which need access the live cluster will be placed here
-var _ = Describe(`[Jira:"Cluster Version Operator"] cluster-version-operator`, func() {
-	var (
-		restCfg    *rest.Config
-		kubeClient kubernetes.Interface
-	)
-
-	BeforeEach(func() {
-		var err error
-		// Respects KUBECONFIG env var
-		restCfg, err = GetRestConfig()
-		Expect(err).NotTo(HaveOccurred(), "Failed to load Kubernetes configuration. Please ensure KUBECONFIG environment variable is set.")
-
-		kubeClient, err = GetKubeClient(restCfg)
-		Expect(err).NotTo(HaveOccurred(), "Failed to create Kubernetes client")
-	})
-
-	// Migrated from case NonHyperShiftHOST-Author:jiajliu-Low-46922-check runlevel and scc in cvo ns
-	// Refer to https://github.com/openshift/openshift-tests-private/blob/40374cf20946ff03c88712839a5626af2c88ab31/test/extended/ota/cvo/cvo.go#L1081
-	It("should have correct runlevel and scc", func() {
-		ctx := context.Background()
-		err := SkipIfHypershift(ctx, restCfg)
-		Expect(err).NotTo(HaveOccurred(), "Failed to determine if cluster is HyperShift")
-
-		By("Checking that the 'openshift.io/run-level' label exists on the namespace and has the empty value")
-		ns, err := kubeClient.CoreV1().Namespaces().Get(ctx, cvoNamespace, metav1.GetOptions{})
-		Expect(err).NotTo(HaveOccurred(), "Failed to get namespace %s", cvoNamespace)
-
-		runLevel, exists := ns.ObjectMeta.Labels["openshift.io/run-level"]
-		Expect(exists).To(BeTrue(), "The 'openshift.io/run-level' label on namespace %s does not exist", cvoNamespace)
-		Expect(runLevel).To(BeEmpty(), "Expected the 'openshift.io/run-level' label value on namespace %s has the empty value, but got %s", cvoNamespace, runLevel)
-
-		By("Checking that the annotation 'openshift.io/scc annotation' on the CVO pod has the value hostaccess")
-		podList, err := kubeClient.CoreV1().Pods(cvoNamespace).List(ctx, metav1.ListOptions{
-			LabelSelector: "k8s-app=cluster-version-operator",
-			FieldSelector: "status.phase=Running",
-		})
-		Expect(err).NotTo(HaveOccurred(), "Failed to list running CVO pods")
-		Expect(podList.Items).To(HaveLen(1), "Expected exactly one running CVO pod, but found: %d", len(podList.Items))
-
-		cvoPod := podList.Items[0]
-		sccAnnotation := cvoPod.ObjectMeta.Annotations["openshift.io/scc"]
-		Expect(sccAnnotation).To(Equal("hostaccess"), "Expected the annotation 'openshift.io/scc annotation' on pod %s to have the value 'hostaccess', but got %s", cvoPod.Name, sccAnnotation)
-	})
-})