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

OCPBUGS-29568: Apply hypershift cluster-profile for ibm-cloud-managed
openshift · Mar 12, 2024 · d3b6e4b · d3b6e4b
2 parents 2d68698 + fcba290
commit d3b6e4b
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 0 deletions.
diff --git a/manifests/00-ns.yaml b/manifests/00-ns.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Namespace
 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/0000_90_cluster-machine-approver_01_prometheusrole.yaml b/manifests/0000_90_cluster-machine-approver_01_prometheusrole.yaml
@@ -4,6 +4,7 @@ metadata:
   name: prometheus-k8s
   namespace: openshift-cluster-machine-approver
   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_cluster-machine-approver_02_prometheusrolebinding.yaml b/manifests/0000_90_cluster-machine-approver_02_prometheusrolebinding.yaml
@@ -4,6 +4,7 @@ metadata:
   name: prometheus-k8s
   namespace: openshift-cluster-machine-approver
   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_cluster-machine-approver_03_servicemonitor.yaml b/manifests/0000_90_cluster-machine-approver_03_servicemonitor.yaml
@@ -6,6 +6,7 @@ metadata:
   name: cluster-machine-approver
   namespace: openshift-cluster-machine-approver
   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-rbac-capi.yaml b/manifests/01-rbac-capi.yaml
@@ -4,6 +4,7 @@ kind: ClusterRole
 metadata:
   name: system:openshift:controller:machine-approver-capi
   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"
@@ -24,6 +25,7 @@ kind: ClusterRoleBinding
 metadata:
   name: system:openshift:controller:machine-approver-capi
   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-rbac.yaml b/manifests/01-rbac.yaml
@@ -5,6 +5,7 @@ metadata:
   namespace: openshift-cluster-machine-approver
   name: machine-approver-sa
   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"
@@ -16,6 +17,7 @@ metadata:
   name: machine-approver
   namespace: openshift-cluster-machine-approver
   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"
@@ -43,6 +45,7 @@ metadata:
   name: machine-approver
   namespace: openshift-cluster-machine-approver
   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"
@@ -62,6 +65,7 @@ metadata:
   name: machine-approver
   namespace: openshift-config-managed
   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"
@@ -82,6 +86,7 @@ metadata:
   name: machine-approver
   namespace: openshift-config-managed
   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"
@@ -100,6 +105,7 @@ kind: ClusterRole
 metadata:
   name: system:openshift:controller:machine-approver
   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"
@@ -199,6 +205,7 @@ kind: ClusterRoleBinding
 metadata:
   name: system:openshift:controller:machine-approver
   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-kube-rbac-proxy-config.yaml b/manifests/02-kube-rbac-proxy-config.yaml
@@ -5,6 +5,7 @@ metadata:
   name: kube-rbac-proxy
   namespace: openshift-cluster-machine-approver
   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-metrics-service.yaml b/manifests/03-metrics-service.yaml
@@ -4,6 +4,7 @@ metadata:
   name: machine-approver
   namespace: openshift-cluster-machine-approver
   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"