Merge pull request #269 from qJkee/CNF-5642-optional-operator

CNF-5642 make operator optional
openshift · Jun 28, 2023 · 8234904 · 8234904
2 parents f13083a + fc577de
commit 8234904
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 0 deletions.
diff --git a/hack/gen-crd.sh b/hack/gen-crd.sh
@@ -6,6 +6,7 @@ function annotate_crd() {
   script1='/^  annotations:/a\
 \ \ \ \ exclude.release.openshift.io/internal-openshift-hosted: "true"\
 \ \ \ \ include.release.openshift.io/self-managed-high-availability: "true"\
+\ \ \ \ capability.openshift.io/name: MachineAPI\
 \ \ \ \ include.release.openshift.io/single-node-developer: "true"'
   script2='/^    controller-gen.kubebuilder.io\/version: .*$/d'
   input="${1}"

diff --git a/install/01_clusterautoscaler.crd.yaml b/install/01_clusterautoscaler.crd.yaml
@@ -5,6 +5,7 @@ metadata:
   annotations:
     exclude.release.openshift.io/internal-openshift-hosted: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
+    capability.openshift.io/name: MachineAPI
     include.release.openshift.io/single-node-developer: "true"
   name: clusterautoscalers.autoscaling.openshift.io
 spec:

diff --git a/install/02_machineautoscaler.crd.yaml b/install/02_machineautoscaler.crd.yaml
@@ -5,6 +5,7 @@ metadata:
   annotations:
     exclude.release.openshift.io/internal-openshift-hosted: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
+    capability.openshift.io/name: MachineAPI
     include.release.openshift.io/single-node-developer: "true"
   name: machineautoscalers.autoscaling.openshift.io
 spec:

diff --git a/install/05_kube_rbac_proxy.yaml b/install/05_kube_rbac_proxy.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: MachineAPI
 data:
   config-file.yaml: |+
     authorization:

diff --git a/install/06_servicemonitor.yaml b/install/06_servicemonitor.yaml
@@ -9,6 +9,7 @@ metadata:
     exclude.release.openshift.io/internal-openshift-hosted: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     include.release.openshift.io/single-node-developer: "true"
+    capability.openshift.io/name: MachineAPI
 spec:
   endpoints:
     - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token

diff --git a/install/07_deployment.yaml b/install/07_deployment.yaml
@@ -10,6 +10,7 @@ metadata:
     exclude.release.openshift.io/internal-openshift-hosted: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     include.release.openshift.io/single-node-developer: "true"
+    capability.openshift.io/name: MachineAPI
 spec:
   replicas: 1
   selector:

diff --git a/install/08_clusteroperator.yaml b/install/08_clusteroperator.yaml
@@ -6,6 +6,7 @@ metadata:
     exclude.release.openshift.io/internal-openshift-hosted: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     include.release.openshift.io/single-node-developer: "true"
+    capability.openshift.io/name: MachineAPI
 status:
   versions:
   - name: operator

diff --git a/install/10_cluster_reader_rbac.yaml b/install/10_cluster_reader_rbac.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: MachineAPI
 rules:
 - apiGroups:
   - autoscaling.openshift.io

diff --git a/install/99_tombstones.yaml b/install/99_tombstones.yaml
@@ -6,6 +6,7 @@ metadata:
   annotations:
     include.release.openshift.io/self-managed-high-availability: "true"
     release.openshift.io/delete: "true"
+    capability.openshift.io/name: MachineAPI
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
@@ -15,3 +16,4 @@ metadata:
   annotations:
     include.release.openshift.io/self-managed-high-availability: "true"
     release.openshift.io/delete: "true"
+    capability.openshift.io/name: MachineAPI