From fc577de6786df6524ea5c2a02221c04b2a83edac Mon Sep 17 00:00:00 2001 From: qJkee Date: Mon, 30 Jan 2023 06:32:10 -0500 Subject: [PATCH] CNF-5642 make operator optional --- hack/gen-crd.sh | 1 + install/01_clusterautoscaler.crd.yaml | 1 + install/02_machineautoscaler.crd.yaml | 1 + install/05_kube_rbac_proxy.yaml | 1 + install/06_servicemonitor.yaml | 1 + install/07_deployment.yaml | 1 + install/08_clusteroperator.yaml | 1 + install/10_cluster_reader_rbac.yaml | 1 + install/99_tombstones.yaml | 2 ++ 9 files changed, 10 insertions(+) diff --git a/hack/gen-crd.sh b/hack/gen-crd.sh index af2047fa7..947379169 100755 --- 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 index 4d8af9495..fefe4c123 100644 --- 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" creationTimestamp: null name: clusterautoscalers.autoscaling.openshift.io diff --git a/install/02_machineautoscaler.crd.yaml b/install/02_machineautoscaler.crd.yaml index f010d0d23..e2785f9d7 100644 --- 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" creationTimestamp: null name: machineautoscalers.autoscaling.openshift.io diff --git a/install/05_kube_rbac_proxy.yaml b/install/05_kube_rbac_proxy.yaml index 5c4afbf75..7d5081e37 100644 --- 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 index b9160635b..1c654288b 100644 --- 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 index a0d1c1a57..958cdf7ce 100644 --- 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 index 7cc9706f8..18fcd5fd0 100644 --- 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 index 757d4a381..67dfa7fff 100644 --- 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 index 5bf7d9b1f..f199a9724 100644 --- 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