Merge pull request #915 from stbenjam/revert-914-1719948267322

openshift-merge-bot[bot] · web-flow · commit a780773163e8 · 2024-07-02T19:34:17.000Z
TRT-1733: Revert #914 "OCPBUGS-29547: Apply hypershift cluster-profile for ibm-cloud-managed"
diff --git a/manifests/07-operator.yaml b/manifests/07-operator.yaml
@@ -7,8 +7,6 @@ metadata:
     config.openshift.io/inject-proxy: console-operator
     include.release.openshift.io/self-managed-high-availability: "true"
     include.release.openshift.io/single-node-developer: "true"
-    include.release.openshift.io/hypershift: "true"
-    include.release.openshift.io/ibm-cloud-managed: "true"
     capability.openshift.io/name: Console
 spec:
   replicas: 1
diff --git a/quickstarts/consolequickstart-install-cryostat.yaml b/quickstarts/consolequickstart-install-cryostat.yaml
@@ -3,7 +3,6 @@ kind: ConsoleQuickStart
 metadata:
   annotations:
     capability.openshift.io/name: Console
-    include.release.openshift.io/hypershift: "true"
     include.release.openshift.io/ibm-cloud-managed: 'true'
     include.release.openshift.io/self-managed-high-availability: 'true'
     include.release.openshift.io/single-node-developer: 'true'
diff --git a/quickstarts/impersonate-user.yaml b/quickstarts/impersonate-user.yaml
@@ -3,7 +3,6 @@ kind: ConsoleQuickStart
 metadata:
   annotations:
     capability.openshift.io/name: Console
-    include.release.openshift.io/hypershift: "true"
     include.release.openshift.io/ibm-cloud-managed: 'true'
     include.release.openshift.io/self-managed-high-availability: 'true'
     include.release.openshift.io/single-node-developer: 'true'
diff --git a/quickstarts/install-helmchartrepo-ns.yaml b/quickstarts/install-helmchartrepo-ns.yaml
@@ -3,7 +3,6 @@ kind: ConsoleQuickStart
 metadata:
   name: install-helmchartrepo-ns
   annotations:
-    include.release.openshift.io/hypershift: "true"
     include.release.openshift.io/ibm-cloud-managed: 'true'
     include.release.openshift.io/self-managed-high-availability: 'true'
     include.release.openshift.io/single-node-developer: 'true'
diff --git a/quickstarts/install-serverless.yaml b/quickstarts/install-serverless.yaml
@@ -3,7 +3,6 @@ kind: ConsoleQuickStart
 metadata:
   name: install-serverless
   annotations:
-    include.release.openshift.io/hypershift: "true"
     include.release.openshift.io/ibm-cloud-managed: 'true'
     include.release.openshift.io/self-managed-high-availability: 'true'
     include.release.openshift.io/single-node-developer: 'true'
diff --git a/quickstarts/jboss-eap7-with-helm.yaml b/quickstarts/jboss-eap7-with-helm.yaml
@@ -3,7 +3,6 @@ kind: ConsoleQuickStart
 metadata:
   name: jboss-eap7-with-helm
   annotations:
-    include.release.openshift.io/hypershift: "true"
     include.release.openshift.io/ibm-cloud-managed: 'true'
     include.release.openshift.io/self-managed-high-availability: 'true'
     include.release.openshift.io/single-node-developer: 'true'
diff --git a/quickstarts/manage-helm-repos.yaml b/quickstarts/manage-helm-repos.yaml
@@ -3,7 +3,6 @@ kind: ConsoleQuickStart
 metadata:
   name: manage-helm-repos
   annotations:
-    include.release.openshift.io/hypershift: "true"
     include.release.openshift.io/ibm-cloud-managed: 'true'
     include.release.openshift.io/self-managed-high-availability: 'true'
     include.release.openshift.io/single-node-developer: 'true'
diff --git a/quickstarts/node-with-s2i.yaml b/quickstarts/node-with-s2i.yaml
@@ -3,7 +3,6 @@ kind: ConsoleQuickStart
 metadata:
   name: node-with-s2i
   annotations:
-    include.release.openshift.io/hypershift: "true"
     include.release.openshift.io/ibm-cloud-managed: 'true'
     include.release.openshift.io/self-managed-high-availability: 'true'
     include.release.openshift.io/single-node-developer: 'true'
diff --git a/quickstarts/quarkus-with-helm.yaml b/quickstarts/quarkus-with-helm.yaml
@@ -3,7 +3,6 @@ kind: ConsoleQuickStart
 metadata:
   name: quarkus-with-helm
   annotations:
-    include.release.openshift.io/hypershift: "true"
     include.release.openshift.io/ibm-cloud-managed: 'true'
     include.release.openshift.io/self-managed-high-availability: 'true'
     include.release.openshift.io/single-node-developer: 'true'
diff --git a/quickstarts/quarkus-with-s2i.yaml b/quickstarts/quarkus-with-s2i.yaml
@@ -3,7 +3,6 @@ kind: ConsoleQuickStart
 metadata:
   name: quarkus-with-s2i
   annotations:
-    include.release.openshift.io/hypershift: "true"
     include.release.openshift.io/ibm-cloud-managed: 'true'
     include.release.openshift.io/self-managed-high-availability: 'true'
     include.release.openshift.io/single-node-developer: 'true'
diff --git a/quickstarts/spring-with-s2i.yaml b/quickstarts/spring-with-s2i.yaml
@@ -3,7 +3,6 @@ kind: ConsoleQuickStart
 metadata:
   name: spring-with-s2i
   annotations:
-    include.release.openshift.io/hypershift: "true"
     include.release.openshift.io/ibm-cloud-managed: 'true'
     include.release.openshift.io/self-managed-high-availability: 'true'
     include.release.openshift.io/single-node-developer: 'true'
