From 39e7dcc8bf9677789b51bf9fbcd862014425ce3e Mon Sep 17 00:00:00 2001 From: Christophe Fergeau Date: Mon, 7 Dec 2020 15:01:53 +0100 Subject: [PATCH] Annotate manifests for single-node-developer cluster profile This partially implements phase 1 of https://github.com/openshift/enhancements#482 and does not change behavior. Initially, all cluster-kube-controller-manager-operator manifests are included in the single-node-developer cluster profile. Follow-on PRs may exclude any of these that are not needed in the profile. --- .../0000_25_kube-controller-manager-operator_00_namespace.yaml | 1 + ...000_25_kube-controller-manager-operator_01_operator.cr.yaml | 1 + .../0000_25_kube-controller-manager-operator_02_service.yaml | 1 + .../0000_25_kube-controller-manager-operator_03_configmap.yaml | 1 + ...kube-controller-manager-operator_04_clusterrolebinding.yaml | 1 + ..._25_kube-controller-manager-operator_05_serviceaccount.yaml | 1 + ...0000_25_kube-controller-manager-operator_06_deployment.yaml | 1 + ...25_kube-controller-manager-operator_07_clusteroperator.yaml | 1 + ..._90_kube-controller-manager-operator_01_prometheusrole.yaml | 1 + ...e-controller-manager-operator_02_prometheusrolebinding.yaml | 1 + ..._90_kube-controller-manager-operator_03_servicemonitor.yaml | 1 + ...-manager-operator_04_servicemonitor-controller-manager.yaml | 3 +++ .../0000_90_kube-controller-manager-operator_05_alerts.yaml | 1 + 13 files changed, 15 insertions(+) diff --git a/manifests/0000_25_kube-controller-manager-operator_00_namespace.yaml b/manifests/0000_25_kube-controller-manager-operator_00_namespace.yaml index 4307c1cf5..fb9982b49 100644 --- a/manifests/0000_25_kube-controller-manager-operator_00_namespace.yaml +++ b/manifests/0000_25_kube-controller-manager-operator_00_namespace.yaml @@ -4,6 +4,7 @@ metadata: annotations: 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" openshift.io/node-selector: "" labels: openshift.io/run-level: "0" diff --git a/manifests/0000_25_kube-controller-manager-operator_01_operator.cr.yaml b/manifests/0000_25_kube-controller-manager-operator_01_operator.cr.yaml index 273e9bbde..a9d386d42 100644 --- a/manifests/0000_25_kube-controller-manager-operator_01_operator.cr.yaml +++ b/manifests/0000_25_kube-controller-manager-operator_01_operator.cr.yaml @@ -5,6 +5,7 @@ metadata: annotations: 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" release.openshift.io/create-only: "true" spec: managementState: Managed diff --git a/manifests/0000_25_kube-controller-manager-operator_02_service.yaml b/manifests/0000_25_kube-controller-manager-operator_02_service.yaml index c10e5b6c3..d2ab0c18e 100644 --- a/manifests/0000_25_kube-controller-manager-operator_02_service.yaml +++ b/manifests/0000_25_kube-controller-manager-operator_02_service.yaml @@ -4,6 +4,7 @@ metadata: annotations: 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" service.alpha.openshift.io/serving-cert-secret-name: kube-controller-manager-operator-serving-cert labels: app: kube-controller-manager-operator diff --git a/manifests/0000_25_kube-controller-manager-operator_03_configmap.yaml b/manifests/0000_25_kube-controller-manager-operator_03_configmap.yaml index d886f72c1..602eec82f 100644 --- a/manifests/0000_25_kube-controller-manager-operator_03_configmap.yaml +++ b/manifests/0000_25_kube-controller-manager-operator_03_configmap.yaml @@ -6,6 +6,7 @@ metadata: annotations: 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" data: config.yaml: | apiVersion: operator.openshift.io/v1 diff --git a/manifests/0000_25_kube-controller-manager-operator_04_clusterrolebinding.yaml b/manifests/0000_25_kube-controller-manager-operator_04_clusterrolebinding.yaml index d330fb687..96dd963d4 100644 --- a/manifests/0000_25_kube-controller-manager-operator_04_clusterrolebinding.yaml +++ b/manifests/0000_25_kube-controller-manager-operator_04_clusterrolebinding.yaml @@ -5,6 +5,7 @@ metadata: annotations: 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" roleRef: kind: ClusterRole name: cluster-admin diff --git a/manifests/0000_25_kube-controller-manager-operator_05_serviceaccount.yaml b/manifests/0000_25_kube-controller-manager-operator_05_serviceaccount.yaml index cd047147a..5147b3a72 100644 --- a/manifests/0000_25_kube-controller-manager-operator_05_serviceaccount.yaml +++ b/manifests/0000_25_kube-controller-manager-operator_05_serviceaccount.yaml @@ -6,3 +6,4 @@ metadata: annotations: 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_25_kube-controller-manager-operator_06_deployment.yaml b/manifests/0000_25_kube-controller-manager-operator_06_deployment.yaml index 9ff34c74d..6eb36c434 100644 --- a/manifests/0000_25_kube-controller-manager-operator_06_deployment.yaml +++ b/manifests/0000_25_kube-controller-manager-operator_06_deployment.yaml @@ -8,6 +8,7 @@ metadata: annotations: include.release.openshift.io/self-managed-high-availability: "true" exclude.release.openshift.io/internal-openshift-hosted: "true" + include.release.openshift.io/single-node-developer: "true" spec: replicas: 1 strategy: diff --git a/manifests/0000_25_kube-controller-manager-operator_07_clusteroperator.yaml b/manifests/0000_25_kube-controller-manager-operator_07_clusteroperator.yaml index 8788227e5..716559050 100644 --- a/manifests/0000_25_kube-controller-manager-operator_07_clusteroperator.yaml +++ b/manifests/0000_25_kube-controller-manager-operator_07_clusteroperator.yaml @@ -5,6 +5,7 @@ metadata: annotations: include.release.openshift.io/self-managed-high-availability: "true" exclude.release.openshift.io/internal-openshift-hosted: "true" + include.release.openshift.io/single-node-developer: "true" spec: {} status: versions: diff --git a/manifests/0000_90_kube-controller-manager-operator_01_prometheusrole.yaml b/manifests/0000_90_kube-controller-manager-operator_01_prometheusrole.yaml index 27feaae43..838301c88 100644 --- a/manifests/0000_90_kube-controller-manager-operator_01_prometheusrole.yaml +++ b/manifests/0000_90_kube-controller-manager-operator_01_prometheusrole.yaml @@ -7,6 +7,7 @@ metadata: annotations: 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" rules: - apiGroups: - "" diff --git a/manifests/0000_90_kube-controller-manager-operator_02_prometheusrolebinding.yaml b/manifests/0000_90_kube-controller-manager-operator_02_prometheusrolebinding.yaml index d708fce7c..bbd7a0735 100644 --- a/manifests/0000_90_kube-controller-manager-operator_02_prometheusrolebinding.yaml +++ b/manifests/0000_90_kube-controller-manager-operator_02_prometheusrolebinding.yaml @@ -6,6 +6,7 @@ metadata: annotations: 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" roleRef: apiGroup: rbac.authorization.k8s.io kind: Role diff --git a/manifests/0000_90_kube-controller-manager-operator_03_servicemonitor.yaml b/manifests/0000_90_kube-controller-manager-operator_03_servicemonitor.yaml index 4100a10e1..1d658ab57 100644 --- a/manifests/0000_90_kube-controller-manager-operator_03_servicemonitor.yaml +++ b/manifests/0000_90_kube-controller-manager-operator_03_servicemonitor.yaml @@ -6,6 +6,7 @@ metadata: annotations: 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" spec: endpoints: - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token diff --git a/manifests/0000_90_kube-controller-manager-operator_04_servicemonitor-controller-manager.yaml b/manifests/0000_90_kube-controller-manager-operator_04_servicemonitor-controller-manager.yaml index c4e9391e9..3b630169b 100644 --- a/manifests/0000_90_kube-controller-manager-operator_04_servicemonitor-controller-manager.yaml +++ b/manifests/0000_90_kube-controller-manager-operator_04_servicemonitor-controller-manager.yaml @@ -6,6 +6,7 @@ metadata: annotations: 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" rules: - apiGroups: - "" @@ -26,6 +27,7 @@ metadata: annotations: 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" roleRef: apiGroup: rbac.authorization.k8s.io kind: Role @@ -45,6 +47,7 @@ metadata: annotations: 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" spec: endpoints: - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token diff --git a/manifests/0000_90_kube-controller-manager-operator_05_alerts.yaml b/manifests/0000_90_kube-controller-manager-operator_05_alerts.yaml index f8d72b880..eb487d124 100644 --- a/manifests/0000_90_kube-controller-manager-operator_05_alerts.yaml +++ b/manifests/0000_90_kube-controller-manager-operator_05_alerts.yaml @@ -6,6 +6,7 @@ metadata: annotations: include.release.openshift.io/self-managed-high-availability: "true" exclude.release.openshift.io/internal-openshift-hosted: "true" + include.release.openshift.io/single-node-developer: "true" spec: groups: - name: cluster-version