openshift · openshift-merge-robot · Sep 9, 2022 · Jul 26, 2022
diff --git a/manifests/0000_90_console-operator_01_prometheusrbac.yaml b/manifests/0000_90_console-operator_01_prometheusrbac.yaml
@@ -8,6 +8,7 @@ metadata:
     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"
+    capability.openshift.io/name: Console
 rules:
   - apiGroups:
       - ""
@@ -30,6 +31,7 @@ metadata:
     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"
+    capability.openshift.io/name: Console
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role

diff --git a/manifests/0000_90_console-operator_02_servicemonitor.yaml b/manifests/0000_90_console-operator_02_servicemonitor.yaml
@@ -8,6 +8,7 @@ metadata:
     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"
+    capability.openshift.io/name: Console
 spec:
   endpoints:
     - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token

diff --git a/manifests/0000_90_console_01_prometheusrbac.yaml b/manifests/0000_90_console_01_prometheusrbac.yaml
@@ -8,6 +8,7 @@ metadata:
     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"
+    capability.openshift.io/name: Console
 rules:
   - apiGroups:
       - ""
@@ -30,6 +31,7 @@ metadata:
     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"
+    capability.openshift.io/name: Console
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role

diff --git a/manifests/0000_90_console_02_servicemonitor.yaml b/manifests/0000_90_console_02_servicemonitor.yaml
@@ -8,6 +8,7 @@ metadata:
     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"
+    capability.openshift.io/name: Console
 spec:
   endpoints:
     - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token

diff --git a/manifests/01-helm.yaml b/manifests/01-helm.yaml
@@ -6,6 +6,7 @@ metadata:
     include.release.openshift.io/self-managed-high-availability: "true"
     include.release.openshift.io/single-node-developer: "true"
     release.openshift.io/create-only: "true"
+    capability.openshift.io/name: Console
   name: openshift-helm-charts
 spec:
   name: OpenShift Helm Charts

diff --git a/manifests/01-oauth.yaml b/manifests/01-oauth.yaml
@@ -7,5 +7,6 @@ metadata:
     include.release.openshift.io/self-managed-high-availability: "true"
     include.release.openshift.io/single-node-developer: "true"
     release.openshift.io/create-only: "true"
+    capability.openshift.io/name: Console
 grantMethod: auto
 respondWithChallenges: false
diff --git a/manifests/01-operator-config.yaml b/manifests/01-operator-config.yaml
@@ -7,5 +7,6 @@ metadata:
     include.release.openshift.io/self-managed-high-availability: "true"
     include.release.openshift.io/single-node-developer: "true"
     release.openshift.io/create-only: "true"
+    capability.openshift.io/name: Console
 spec:
   managementState: Managed
diff --git a/manifests/02-namespace.yaml b/manifests/02-namespace.yaml
@@ -8,6 +8,7 @@ metadata:
     include.release.openshift.io/single-node-developer: "true"
     openshift.io/node-selector: ""
     workload.openshift.io/allowed: "management"
+    capability.openshift.io/name: Console
   labels:
     network.openshift.io/policy-group: "console"
     openshift.io/cluster-monitoring: "true"
@@ -22,6 +23,7 @@ metadata:
     include.release.openshift.io/single-node-developer: "true"
     openshift.io/node-selector: ""
     workload.openshift.io/allowed: "management"
+    capability.openshift.io/name: Console
   labels:
     openshift.io/cluster-monitoring: "true"
 ---
@@ -35,3 +37,4 @@ metadata:
     include.release.openshift.io/single-node-developer: "true"
     openshift.io/node-selector: ""
     workload.openshift.io/allowed: "management"
+    capability.openshift.io/name: Console
diff --git a/manifests/03-rbac-role-cluster-extensions.yaml b/manifests/03-rbac-role-cluster-extensions.yaml
@@ -8,6 +8,7 @@ metadata:
     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"
+    capability.openshift.io/name: Console
 rules:
 - apiGroups:
   - console.openshift.io

diff --git a/manifests/03-rbac-role-cluster.yaml b/manifests/03-rbac-role-cluster.yaml
@@ -6,6 +6,7 @@ metadata:
     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"
+    capability.openshift.io/name: Console
 rules:
   - apiGroups:
       - oauth.openshift.io
@@ -84,6 +85,7 @@ metadata:
     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"
+    capability.openshift.io/name: Console
 rules:
   - apiGroups:
       - apiextensions.k8s.io
@@ -117,6 +119,7 @@ metadata:
     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"
+    capability.openshift.io/name: Console
 rules:
   - apiGroups:
       - helm.openshift.io
@@ -135,6 +138,7 @@ metadata:
     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"
+    capability.openshift.io/name: Console
 rules:
   - apiGroups:
       - action.open-cluster-management.io

diff --git a/manifests/03-rbac-role-ns-console.yaml b/manifests/03-rbac-role-ns-console.yaml
@@ -7,6 +7,7 @@ metadata:
     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"
+    capability.openshift.io/name: Console
 rules:
 # TODO: delete is needed for ownerRefs on older clusters
 # should remove in the future.

diff --git a/manifests/03-rbac-role-ns-openshift-config-managed.yaml b/manifests/03-rbac-role-ns-openshift-config-managed.yaml
@@ -7,6 +7,7 @@ metadata:
     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"
+    capability.openshift.io/name: Console
 rules:
 - apiGroups:
   - ""
@@ -38,6 +39,7 @@ metadata:
     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"
+    capability.openshift.io/name: Console
 rules:
 - apiGroups:
   - ""
@@ -57,6 +59,7 @@ metadata:
     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"
+    capability.openshift.io/name: Console
 rules:
 - apiGroups:
   - ""

diff --git a/manifests/03-rbac-role-ns-openshift-config.yaml b/manifests/03-rbac-role-ns-openshift-config.yaml
@@ -7,6 +7,7 @@ metadata:
     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"
+    capability.openshift.io/name: Console
 rules:
   - apiGroups:
       - ""

diff --git a/manifests/03-rbac-role-ns-openshift-console-user-settings.yaml b/manifests/03-rbac-role-ns-openshift-console-user-settings.yaml
@@ -7,6 +7,7 @@ metadata:
     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"
+    capability.openshift.io/name: Console
 rules:
 - apiGroups:
   - rbac.authorization.k8s.io
@@ -43,6 +44,7 @@ metadata:
     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"
+    capability.openshift.io/name: Console
 roleRef:
   kind: Role
   name: console-user-settings-admin

diff --git a/manifests/03-rbac-role-ns-operator.yaml b/manifests/03-rbac-role-ns-operator.yaml
@@ -7,6 +7,7 @@ metadata:
     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"
+    capability.openshift.io/name: Console
 rules:
 - apiGroups:
   - ""

diff --git a/manifests/04-rbac-rolebinding-cluster.yaml b/manifests/04-rbac-rolebinding-cluster.yaml
@@ -6,6 +6,7 @@ metadata:
     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"
+    capability.openshift.io/name: Console
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
@@ -23,6 +24,7 @@ metadata:
     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"
+    capability.openshift.io/name: Console
 roleRef:
   kind: ClusterRole
   name: console-extensions-reader
@@ -40,6 +42,7 @@ metadata:
     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"
+    capability.openshift.io/name: Console
 roleRef:
   # for protected endpoints like /metrics, the operator must perform
   # authentication (tokenreview) & authorization (subjectaccessreview)
@@ -60,6 +63,7 @@ metadata:
     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"
+    capability.openshift.io/name: Console
 roleRef:
   # CRD lists are protected from unpriviledged users, access is
   # granted to Service Account by this ClusterRole
@@ -74,12 +78,13 @@ subjects:
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
+  name: helm-chartrepos-view
   annotations:
     "release.openshift.io/create-only": "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"
-  name: helm-chartrepos-view
+    capability.openshift.io/name: Console
 subjects:
   - kind: Group
     apiGroup: rbac.authorization.k8s.io
@@ -97,6 +102,7 @@ metadata:
     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"
+    capability.openshift.io/name: Console
 roleRef:
   # for protected endpoints like /metrics, the console backend must perform
   # authentication (tokenreview) & authorization (subjectaccessreview)
@@ -118,6 +124,7 @@ metadata:
     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"
+    capability.openshift.io/name: Console
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole

diff --git a/manifests/04-rbac-rolebinding.yaml b/manifests/04-rbac-rolebinding.yaml
@@ -7,6 +7,7 @@ metadata:
     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"
+    capability.openshift.io/name: Console
 roleRef:
   kind: Role
   name: console-operator
@@ -25,6 +26,7 @@ metadata:
     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"
+    capability.openshift.io/name: Console
 roleRef:
   kind: Role
   name: console-operator
@@ -42,6 +44,7 @@ metadata:
     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"
+    capability.openshift.io/name: Console
 roleRef:
   kind: Role
   name: console-operator
@@ -60,6 +63,7 @@ metadata:
     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"
+    capability.openshift.io/name: Console
 roleRef:
   kind: Role
   name: console-public
@@ -78,6 +82,7 @@ metadata:
     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"
+    capability.openshift.io/name: Console
 roleRef:
   kind: Role
   name: console-operator
@@ -96,6 +101,7 @@ metadata:
     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"
+    capability.openshift.io/name: Console
 roleRef:
   kind: Role
   name: extension-apiserver-authentication-reader
@@ -114,6 +120,7 @@ metadata:
     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"
+    capability.openshift.io/name: Console
 roleRef:
   kind: Role
   name: console-configmap-reader
@@ -132,6 +139,7 @@ metadata:
     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"
+    capability.openshift.io/name: Console
 roleRef:
   kind: Role
   name: extension-apiserver-authentication-reader

diff --git a/manifests/05-config.yaml b/manifests/05-config.yaml
@@ -7,6 +7,7 @@ metadata:
     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"
+    capability.openshift.io/name: Console
 data:
   controller-config.yaml: |
     apiVersion: operator.openshift.io/v1alpha1

diff --git a/manifests/05-service.yaml b/manifests/05-service.yaml
@@ -7,6 +7,7 @@ metadata:
     include.release.openshift.io/self-managed-high-availability: "true"
     include.release.openshift.io/single-node-developer: "true"
     service.beta.openshift.io/serving-cert-secret-name: serving-cert
+    capability.openshift.io/name: Console
   labels:
     name: console-operator
   name: metrics

diff --git a/manifests/06-sa.yaml b/manifests/06-sa.yaml
@@ -7,6 +7,7 @@ metadata:
     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"
+    capability.openshift.io/name: Console
 ---
 apiVersion: v1
 kind: ServiceAccount
@@ -17,3 +18,4 @@ metadata:
     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"
+    capability.openshift.io/name: Console
diff --git a/manifests/07-downloads-helm.yaml b/manifests/07-downloads-helm.yaml
@@ -6,6 +6,7 @@ metadata:
     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"
+    capability.openshift.io/name: Console
 spec:
   description: |
     Helm 3 is a package manager for Kubernetes applications which enables defining,

diff --git a/manifests/07-operator.yaml b/manifests/07-operator.yaml
@@ -7,6 +7,7 @@ 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"
+    capability.openshift.io/name: Console
 spec:
   replicas: 1
   selector:

diff --git a/manifests/08-clusteroperator.yaml b/manifests/08-clusteroperator.yaml
@@ -6,6 +6,7 @@ metadata:
     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"
+    capability.openshift.io/name: Console
 spec: {}
 status:
   versions:

diff --git a/manifests/09-console-link-openshift-blog.yaml b/manifests/09-console-link-openshift-blog.yaml
@@ -7,6 +7,7 @@ metadata:
     include.release.openshift.io/self-managed-high-availability: "true"
     include.release.openshift.io/single-node-developer: "true"
     release.openshift.io/delete: "true"
+    capability.openshift.io/name: Console
 spec:
   href: 'https://blog.openshift.com'
   location: HelpMenu

diff --git a/manifests/09-console-link-openshift-learning-portal.yaml b/manifests/09-console-link-openshift-learning-portal.yaml
@@ -7,6 +7,7 @@ metadata:
     include.release.openshift.io/self-managed-high-availability: "true"
     include.release.openshift.io/single-node-developer: "true"
     release.openshift.io/delete: "true"
+    capability.openshift.io/name: Console
 spec:
   href: 'https://learn.openshift.com/?ref=webconsole'
   location: HelpMenu

diff --git a/quickstarts/add-healthchecks-quickstart.yaml b/quickstarts/add-healthchecks-quickstart.yaml
@@ -6,6 +6,7 @@ metadata:
     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"
+    capability.openshift.io/name: Console
 spec:
   displayName: Add health checks to your sample application
   durationMinutes: 10