Merge pull request #999 from openshift-art-build-bot/art-8431

openshift-merge-bot[bot] · web-flow · commit ca769ebb7c46 · 2024-04-22T06:53:03.000Z
OCPBUGS-29559: Apply hypershift cluster-profile for ibm-cloud-managed
diff --git a/manifests/0000_90_cluster-image-registry-operator_00_servicemonitor-rbac.yaml b/manifests/0000_90_cluster-image-registry-operator_00_servicemonitor-rbac.yaml
@@ -5,6 +5,7 @@ metadata:
   name: registry-monitoring
   annotations:
     capability.openshift.io/name: ImageRegistry
+    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"
@@ -22,6 +23,7 @@ metadata:
   name: registry-monitoring
   annotations:
     capability.openshift.io/name: ImageRegistry
+    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"
@@ -42,6 +44,7 @@ metadata:
   namespace: openshift-image-registry
   annotations:
     capability.openshift.io/name: ImageRegistry
+    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"
@@ -64,6 +67,7 @@ metadata:
   namespace: openshift-image-registry
   annotations:
     capability.openshift.io/name: ImageRegistry
+    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/manifests/0000_90_cluster-image-registry-operator_01_operand-servicemonitor.yaml b/manifests/0000_90_cluster-image-registry-operator_01_operand-servicemonitor.yaml
@@ -6,6 +6,7 @@ metadata:
   namespace: openshift-image-registry
   annotations:
     capability.openshift.io/name: ImageRegistry
+    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/manifests/0000_90_cluster-image-registry-operator_02_operator-servicemonitor.yaml b/manifests/0000_90_cluster-image-registry-operator_02_operator-servicemonitor.yaml
@@ -6,6 +6,7 @@ metadata:
   namespace: openshift-image-registry
   annotations:
     capability.openshift.io/name: ImageRegistry
+    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/manifests/01-namespace.yaml b/manifests/01-namespace.yaml
@@ -5,6 +5,7 @@ metadata:
   name: openshift-image-registry
   annotations:
     capability.openshift.io/name: ImageRegistry
+    include.release.openshift.io/hypershift: "true"
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     openshift.io/node-selector: ""
diff --git a/manifests/01-registry-credentials-request-alibaba.yaml b/manifests/01-registry-credentials-request-alibaba.yaml
@@ -7,6 +7,7 @@ metadata:
   namespace: openshift-cloud-credential-operator
   annotations:
     capability.openshift.io/name: ImageRegistry+CloudCredential
+    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/manifests/01-registry-credentials-request-azure.yaml b/manifests/01-registry-credentials-request-azure.yaml
@@ -7,6 +7,7 @@ metadata:
   namespace: openshift-cloud-credential-operator
   annotations:
     capability.openshift.io/name: ImageRegistry+CloudCredential
+    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/manifests/01-registry-credentials-request-gcs.yaml b/manifests/01-registry-credentials-request-gcs.yaml
@@ -7,6 +7,7 @@ metadata:
   namespace: openshift-cloud-credential-operator
   annotations:
     capability.openshift.io/name: ImageRegistry+CloudCredential
+    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/manifests/01-registry-credentials-request-ibmcos.yaml b/manifests/01-registry-credentials-request-ibmcos.yaml
@@ -7,6 +7,7 @@ metadata:
   namespace: openshift-cloud-credential-operator
   annotations:
     capability.openshift.io/name: ImageRegistry+CloudCredential
+    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/manifests/01-registry-credentials-request-openstack.yaml b/manifests/01-registry-credentials-request-openstack.yaml
@@ -7,6 +7,7 @@ metadata:
   namespace: openshift-cloud-credential-operator
   annotations:
     capability.openshift.io/name: ImageRegistry+CloudCredential
+    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/manifests/01-registry-credentials-request-powervs.yaml b/manifests/01-registry-credentials-request-powervs.yaml
@@ -7,6 +7,7 @@ metadata:
   namespace: openshift-cloud-credential-operator
   annotations:
     capability.openshift.io/name: ImageRegistry+CloudCredential
+    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/manifests/01-registry-credentials-request.yaml b/manifests/01-registry-credentials-request.yaml
@@ -7,6 +7,7 @@ metadata:
   namespace: openshift-cloud-credential-operator
   annotations:
     capability.openshift.io/name: ImageRegistry+CloudCredential
+    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/manifests/02-rbac.yaml b/manifests/02-rbac.yaml
@@ -5,6 +5,7 @@ metadata:
   name: cluster-image-registry-operator
   annotations:
     capability.openshift.io/name: ImageRegistry
+    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"
@@ -230,6 +231,7 @@ metadata:
   namespace: openshift-image-registry
   annotations:
     capability.openshift.io/name: ImageRegistry
+    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"
@@ -293,6 +295,7 @@ metadata:
   name: default-account-cluster-image-registry-operator
   annotations:
     capability.openshift.io/name: ImageRegistry
+    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"
@@ -312,6 +315,7 @@ metadata:
   namespace: openshift-image-registry
   annotations:
     capability.openshift.io/name: ImageRegistry
+    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/manifests/03-sa.yaml b/manifests/03-sa.yaml
@@ -6,6 +6,7 @@ metadata:
   namespace: openshift-image-registry
   annotations:
     capability.openshift.io/name: ImageRegistry
+    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/manifests/04-ca-trusted.yaml b/manifests/04-ca-trusted.yaml
@@ -4,6 +4,7 @@ kind: ConfigMap
 metadata:
   annotations:
     capability.openshift.io/name: ImageRegistry
+    include.release.openshift.io/hypershift: "true"
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     release.openshift.io/create-only: "true"
diff --git a/manifests/05-ca-rbac.yaml b/manifests/05-ca-rbac.yaml
@@ -6,6 +6,7 @@ metadata:
   namespace: openshift-image-registry
   annotations:
     capability.openshift.io/name: ImageRegistry
+    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"
@@ -26,6 +27,7 @@ metadata:
   namespace: openshift-image-registry
   annotations:
     capability.openshift.io/name: ImageRegistry
+    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/manifests/06-ca-serviceaccount.yaml b/manifests/06-ca-serviceaccount.yaml
@@ -6,6 +6,7 @@ metadata:
   namespace: openshift-image-registry
   annotations:
     capability.openshift.io/name: ImageRegistry
+    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/manifests/07-operator-ibm-cloud-managed.yaml b/manifests/07-operator-ibm-cloud-managed.yaml
@@ -5,6 +5,7 @@ metadata:
   annotations:
     capability.openshift.io/name: ImageRegistry
     config.openshift.io/inject-proxy: cluster-image-registry-operator
+    include.release.openshift.io/hypershift: "true"
     include.release.openshift.io/ibm-cloud-managed: "true"
   name: cluster-image-registry-operator
   namespace: openshift-image-registry
diff --git a/manifests/07-operator-service.yaml b/manifests/07-operator-service.yaml
@@ -4,6 +4,7 @@ kind: Service
 metadata:
   annotations:
     capability.openshift.io/name: ImageRegistry
+    include.release.openshift.io/hypershift: "true"
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     service.alpha.openshift.io/serving-cert-secret-name: image-registry-operator-tls
diff --git a/manifests/08-clusteroperator.yaml b/manifests/08-clusteroperator.yaml
@@ -4,6 +4,7 @@ metadata:
   name: image-registry
   annotations:
     capability.openshift.io/name: ImageRegistry
+    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/manifests/09-prometheus-rules-imagestreams.yaml b/manifests/09-prometheus-rules-imagestreams.yaml
@@ -5,6 +5,7 @@ metadata:
   namespace: openshift-image-registry
   annotations:
     capability.openshift.io/name: ImageRegistry
+    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/manifests/09-prometheus-rules-registry-operations.yaml b/manifests/09-prometheus-rules-registry-operations.yaml
@@ -5,6 +5,7 @@ metadata:
   namespace: openshift-image-registry
   annotations:
     capability.openshift.io/name: ImageRegistry
+    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/manifests/09-prometheus-rules.yaml b/manifests/09-prometheus-rules.yaml
@@ -6,6 +6,7 @@ metadata:
   annotations:
     capability.openshift.io/name: ImageRegistry
     release.openshift.io/delete: "true"
+    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/profile-patches/ibm-cloud-managed/07-operator.yaml-patch b/profile-patches/ibm-cloud-managed/07-operator.yaml-patch
@@ -3,6 +3,7 @@
   value:
     capability.openshift.io/name: ImageRegistry
     config.openshift.io/inject-proxy: cluster-image-registry-operator
+    include.release.openshift.io/hypershift: "true"
     include.release.openshift.io/ibm-cloud-managed: "true"
 - op: remove
   path: /spec/template/spec/nodeSelector
