Revert "Merge pull request #914 from jhadvig/OCPBUGS-29547"

This reverts commit 1a8cac0, reversing
changes made to 7f3a07b.

Author: stbenjam

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

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'

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'

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'

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'

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'

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'

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'

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'

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'