From 474358e178ad3151184069152ab4620e5973030d Mon Sep 17 00:00:00 2001 From: Christophe Fergeau Date: Tue, 1 Dec 2020 16:14:33 +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-openshift-apiserver-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_30_openshift-apiserver-operator_00_namespace.yaml | 1 + .../0000_30_openshift-apiserver-operator_01_operator.cr.yaml | 1 + .../0000_30_openshift-apiserver-operator_03_configmap.yaml | 1 + .../0000_30_openshift-apiserver-operator_03_trusted_ca_cm.yaml | 1 + manifests/0000_30_openshift-apiserver-operator_04_roles.yaml | 1 + ...0000_30_openshift-apiserver-operator_05_serviceaccount.yaml | 1 + manifests/0000_30_openshift-apiserver-operator_06_service.yaml | 1 + .../0000_30_openshift-apiserver-operator_07_deployment.yaml | 1 + ...000_30_openshift-apiserver-operator_08_clusteroperator.yaml | 1 + .../0000_30_openshift-apiserver-operator_09_flowschema.yaml | 3 +++ ...0000_90_openshift-apiserver-operator_01_prometheusrole.yaml | 1 + ..._openshift-apiserver-operator_02_prometheusrolebinding.yaml | 1 + ...0000_90_openshift-apiserver-operator_03_servicemonitor.yaml | 1 + ...enshift-apiserver-operator_04_servicemonitor-apiserver.yaml | 3 +++ ...penshift-apiserver-operator_05_check-endpoints_service.yaml | 1 + ...t-apiserver-operator_05_check-endpoints_servicemonitor.yaml | 1 + 16 files changed, 20 insertions(+) diff --git a/manifests/0000_30_openshift-apiserver-operator_00_namespace.yaml b/manifests/0000_30_openshift-apiserver-operator_00_namespace.yaml index 4494f37fe..1fd4d2327 100644 --- a/manifests/0000_30_openshift-apiserver-operator_00_namespace.yaml +++ b/manifests/0000_30_openshift-apiserver-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_30_openshift-apiserver-operator_01_operator.cr.yaml b/manifests/0000_30_openshift-apiserver-operator_01_operator.cr.yaml index d55a13196..ab0a4fa76 100644 --- a/manifests/0000_30_openshift-apiserver-operator_01_operator.cr.yaml +++ b/manifests/0000_30_openshift-apiserver-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_30_openshift-apiserver-operator_03_configmap.yaml b/manifests/0000_30_openshift-apiserver-operator_03_configmap.yaml index df9df9980..f8e91e79c 100644 --- a/manifests/0000_30_openshift-apiserver-operator_03_configmap.yaml +++ b/manifests/0000_30_openshift-apiserver-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_30_openshift-apiserver-operator_03_trusted_ca_cm.yaml b/manifests/0000_30_openshift-apiserver-operator_03_trusted_ca_cm.yaml index 899f38d6d..1d6ef84a8 100644 --- a/manifests/0000_30_openshift-apiserver-operator_03_trusted_ca_cm.yaml +++ b/manifests/0000_30_openshift-apiserver-operator_03_trusted_ca_cm.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" release.openshift.io/create-only: "true" labels: config.openshift.io/inject-trusted-cabundle: "true" diff --git a/manifests/0000_30_openshift-apiserver-operator_04_roles.yaml b/manifests/0000_30_openshift-apiserver-operator_04_roles.yaml index 486103bc5..922ca75b1 100644 --- a/manifests/0000_30_openshift-apiserver-operator_04_roles.yaml +++ b/manifests/0000_30_openshift-apiserver-operator_04_roles.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_30_openshift-apiserver-operator_05_serviceaccount.yaml b/manifests/0000_30_openshift-apiserver-operator_05_serviceaccount.yaml index 023a71820..31a424ded 100644 --- a/manifests/0000_30_openshift-apiserver-operator_05_serviceaccount.yaml +++ b/manifests/0000_30_openshift-apiserver-operator_05_serviceaccount.yaml @@ -6,5 +6,6 @@ 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" labels: app: openshift-apiserver-operator diff --git a/manifests/0000_30_openshift-apiserver-operator_06_service.yaml b/manifests/0000_30_openshift-apiserver-operator_06_service.yaml index 80dc52a0d..6586b0fc5 100644 --- a/manifests/0000_30_openshift-apiserver-operator_06_service.yaml +++ b/manifests/0000_30_openshift-apiserver-operator_06_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: openshift-apiserver-operator-serving-cert labels: app: openshift-apiserver-operator diff --git a/manifests/0000_30_openshift-apiserver-operator_07_deployment.yaml b/manifests/0000_30_openshift-apiserver-operator_07_deployment.yaml index 4a2347372..7303fe81d 100644 --- a/manifests/0000_30_openshift-apiserver-operator_07_deployment.yaml +++ b/manifests/0000_30_openshift-apiserver-operator_07_deployment.yaml @@ -7,6 +7,7 @@ metadata: app: openshift-apiserver-operator annotations: include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" exclude.release.openshift.io/internal-openshift-hosted: "true" spec: replicas: 1 diff --git a/manifests/0000_30_openshift-apiserver-operator_08_clusteroperator.yaml b/manifests/0000_30_openshift-apiserver-operator_08_clusteroperator.yaml index 536cb9ff8..f4feca396 100644 --- a/manifests/0000_30_openshift-apiserver-operator_08_clusteroperator.yaml +++ b/manifests/0000_30_openshift-apiserver-operator_08_clusteroperator.yaml @@ -4,6 +4,7 @@ metadata: name: openshift-apiserver annotations: include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" exclude.release.openshift.io/internal-openshift-hosted: "true" spec: {} status: diff --git a/manifests/0000_30_openshift-apiserver-operator_09_flowschema.yaml b/manifests/0000_30_openshift-apiserver-operator_09_flowschema.yaml index 4981be6e9..a7f6eef8b 100644 --- a/manifests/0000_30_openshift-apiserver-operator_09_flowschema.yaml +++ b/manifests/0000_30_openshift-apiserver-operator_09_flowschema.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" spec: distinguisherMethod: type: ByUser @@ -44,6 +45,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: distinguisherMethod: type: ByUser @@ -74,6 +76,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: distinguisherMethod: type: ByUser diff --git a/manifests/0000_90_openshift-apiserver-operator_01_prometheusrole.yaml b/manifests/0000_90_openshift-apiserver-operator_01_prometheusrole.yaml index a3d2c40dd..b9c46ac3d 100644 --- a/manifests/0000_90_openshift-apiserver-operator_01_prometheusrole.yaml +++ b/manifests/0000_90_openshift-apiserver-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_openshift-apiserver-operator_02_prometheusrolebinding.yaml b/manifests/0000_90_openshift-apiserver-operator_02_prometheusrolebinding.yaml index b734bd63e..439b18ae9 100644 --- a/manifests/0000_90_openshift-apiserver-operator_02_prometheusrolebinding.yaml +++ b/manifests/0000_90_openshift-apiserver-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_openshift-apiserver-operator_03_servicemonitor.yaml b/manifests/0000_90_openshift-apiserver-operator_03_servicemonitor.yaml index ffe5cc4d6..54c153c27 100644 --- a/manifests/0000_90_openshift-apiserver-operator_03_servicemonitor.yaml +++ b/manifests/0000_90_openshift-apiserver-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_openshift-apiserver-operator_04_servicemonitor-apiserver.yaml b/manifests/0000_90_openshift-apiserver-operator_04_servicemonitor-apiserver.yaml index b3b64895c..506b82a51 100644 --- a/manifests/0000_90_openshift-apiserver-operator_04_servicemonitor-apiserver.yaml +++ b/manifests/0000_90_openshift-apiserver-operator_04_servicemonitor-apiserver.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 @@ -43,6 +45,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_openshift-apiserver-operator_05_check-endpoints_service.yaml b/manifests/0000_90_openshift-apiserver-operator_05_check-endpoints_service.yaml index 47b256a3b..0b038b385 100644 --- a/manifests/0000_90_openshift-apiserver-operator_05_check-endpoints_service.yaml +++ b/manifests/0000_90_openshift-apiserver-operator_05_check-endpoints_service.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: ports: - name: check-endpoints diff --git a/manifests/0000_90_openshift-apiserver-operator_05_check-endpoints_servicemonitor.yaml b/manifests/0000_90_openshift-apiserver-operator_05_check-endpoints_servicemonitor.yaml index 00f558205..f42ee8d68 100644 --- a/manifests/0000_90_openshift-apiserver-operator_05_check-endpoints_servicemonitor.yaml +++ b/manifests/0000_90_openshift-apiserver-operator_05_check-endpoints_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