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

OCPBUGS-29583: Apply hypershift cluster-profile for ibm-cloud-managed
openshift · May 7, 2024 · 0e9c542 · 0e9c542
2 parents cb3093f + 57888b4
commit 0e9c542
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 0 deletions.
diff --git a/manifests/0000_90_service-ca-operator_01_prometheusrole.yaml b/manifests/0000_90_service-ca-operator_01_prometheusrole.yaml
@@ -4,6 +4,7 @@ metadata:
   name: prometheus-k8s
   namespace: openshift-service-ca-operator
   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/manifests/0000_90_service-ca-operator_02_prometheusrolebinding.yaml b/manifests/0000_90_service-ca-operator_02_prometheusrolebinding.yaml
@@ -4,6 +4,7 @@ metadata:
   name: prometheus-k8s
   namespace: openshift-service-ca-operator
   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/manifests/0000_90_service-ca-operator_03_servicemonitor.yaml b/manifests/0000_90_service-ca-operator_03_servicemonitor.yaml
@@ -4,6 +4,7 @@ metadata:
   name: service-ca-operator
   namespace: openshift-service-ca-operator
   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/manifests/00_roles.yaml b/manifests/00_roles.yaml
@@ -3,6 +3,7 @@ kind: ClusterRoleBinding
 metadata:
   name: system:openshift:operator:service-ca-operator
   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/manifests/01_namespace.yaml b/manifests/01_namespace.yaml
@@ -6,6 +6,7 @@ metadata:
     openshift.io/run-level: "" # specify no run-level turns it off on install and upgrades
   name: openshift-service-ca-operator
   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/manifests/02_service.yaml b/manifests/02_service.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   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/manifests/03_cm.yaml b/manifests/03_cm.yaml
@@ -4,6 +4,7 @@ metadata:
   namespace: openshift-service-ca-operator
   name: service-ca-operator-config
   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/manifests/03_operator.cr.yaml b/manifests/03_operator.cr.yaml
@@ -3,6 +3,7 @@ kind: ServiceCA
 metadata:
   name: cluster
   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/manifests/04_sa.yaml b/manifests/04_sa.yaml
@@ -6,6 +6,7 @@ metadata:
   labels:
     app: service-ca-operator
   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/manifests/05_deploy-ibm-cloud-managed.yaml b/manifests/05_deploy-ibm-cloud-managed.yaml
@@ -3,6 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
+    include.release.openshift.io/hypershift: "true"
     include.release.openshift.io/ibm-cloud-managed: "true"
   labels:
     app: service-ca-operator

diff --git a/manifests/07_clusteroperator.yaml b/manifests/07_clusteroperator.yaml
@@ -3,6 +3,7 @@ kind: ClusterOperator
 metadata:
   name: service-ca
   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/profile-patches/ibm-cloud-managed/05_deploy.yaml-patch b/profile-patches/ibm-cloud-managed/05_deploy.yaml-patch
@@ -1,6 +1,7 @@
 - op: replace
   path: /metadata/annotations
   value:
+    include.release.openshift.io/hypershift: "true"
     include.release.openshift.io/ibm-cloud-managed: "true"
 - op: remove
   path: /spec/template/spec/nodeSelector