From b4c6046e563f23a69ac100a47c5b2f155548e8e0 Mon Sep 17 00:00:00 2001 From: Christophe Fergeau Date: Wed, 2 Dec 2020 15:02:21 +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-config-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. --- empty-resources/0000_05_config-operator_02_apiserver.cr.yaml | 1 + .../0000_05_config-operator_02_authentication.cr.yaml | 1 + empty-resources/0000_05_config-operator_02_build.cr.yaml | 1 + empty-resources/0000_05_config-operator_02_console.cr.yaml | 1 + empty-resources/0000_05_config-operator_02_dns.cr.yaml | 1 + empty-resources/0000_05_config-operator_02_featuregate.cr.yaml | 1 + empty-resources/0000_05_config-operator_02_image.cr.yaml | 1 + .../0000_05_config-operator_02_infrastructure.cr.yaml | 1 + empty-resources/0000_05_config-operator_02_ingress.cr.yaml | 1 + empty-resources/0000_05_config-operator_02_network.cr.yaml | 1 + empty-resources/0000_05_config-operator_02_oauth.cr.yaml | 1 + empty-resources/0000_05_config-operator_02_operatorhub.cr.yaml | 1 + empty-resources/0000_05_config-operator_02_project.cr.yaml | 1 + empty-resources/0000_05_config-operator_02_proxy.cr.yaml | 1 + empty-resources/0000_05_config-operator_02_scheduler.cr.yaml | 1 + .../0000_10_config-operator_01_openshift-config-managed-ns.yaml | 1 + manifests/0000_10_config-operator_01_openshift-config-ns.yaml | 1 + manifests/0000_10_config-operator_02_config.clusterrole.yaml | 1 + manifests/0000_30_config-operator_00_namespace.yaml | 1 + manifests/0000_30_config-operator_01_operator.cr.yaml | 1 + manifests/0000_30_config-operator_01_prometheusrole.yaml | 1 + manifests/0000_30_config-operator_02_prometheusrolebinding.yaml | 1 + manifests/0000_30_config-operator_02_service.yaml | 1 + manifests/0000_30_config-operator_03_servicemonitor.yaml | 1 + manifests/0000_30_config-operator_04_roles.yaml | 1 + manifests/0000_30_config-operator_05_serviceaccount.yaml | 1 + manifests/0000_30_config-operator_07_deployment.yaml | 1 + manifests/0000_30_config-operator_08_clusteroperator.yaml | 1 + 28 files changed, 28 insertions(+) diff --git a/empty-resources/0000_05_config-operator_02_apiserver.cr.yaml b/empty-resources/0000_05_config-operator_02_apiserver.cr.yaml index 996e56e75..f18b92045 100644 --- a/empty-resources/0000_05_config-operator_02_apiserver.cr.yaml +++ b/empty-resources/0000_05_config-operator_02_apiserver.cr.yaml @@ -4,6 +4,7 @@ metadata: name: cluster annotations: include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" # this flag is not set for a cluster coming from 4.5 via upgrade. Hence, 4.5 clusters will keep supporting non-sha256 tokens. oauth-apiserver.openshift.io/secure-token-storage: "true" release.openshift.io/create-only: "true" diff --git a/empty-resources/0000_05_config-operator_02_authentication.cr.yaml b/empty-resources/0000_05_config-operator_02_authentication.cr.yaml index 22c7baded..c44141619 100644 --- a/empty-resources/0000_05_config-operator_02_authentication.cr.yaml +++ b/empty-resources/0000_05_config-operator_02_authentication.cr.yaml @@ -4,5 +4,6 @@ metadata: name: cluster annotations: include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" release.openshift.io/create-only: "true" spec: {} diff --git a/empty-resources/0000_05_config-operator_02_build.cr.yaml b/empty-resources/0000_05_config-operator_02_build.cr.yaml index 0b033dedc..2adc14379 100644 --- a/empty-resources/0000_05_config-operator_02_build.cr.yaml +++ b/empty-resources/0000_05_config-operator_02_build.cr.yaml @@ -4,5 +4,6 @@ metadata: name: cluster annotations: include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" release.openshift.io/create-only: "true" spec: {} diff --git a/empty-resources/0000_05_config-operator_02_console.cr.yaml b/empty-resources/0000_05_config-operator_02_console.cr.yaml index 1e876ea1a..a3b3c3ed8 100644 --- a/empty-resources/0000_05_config-operator_02_console.cr.yaml +++ b/empty-resources/0000_05_config-operator_02_console.cr.yaml @@ -4,5 +4,6 @@ metadata: name: cluster annotations: include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" release.openshift.io/create-only: "true" spec: {} diff --git a/empty-resources/0000_05_config-operator_02_dns.cr.yaml b/empty-resources/0000_05_config-operator_02_dns.cr.yaml index fe33e93bc..1e1dcc226 100644 --- a/empty-resources/0000_05_config-operator_02_dns.cr.yaml +++ b/empty-resources/0000_05_config-operator_02_dns.cr.yaml @@ -4,5 +4,6 @@ metadata: name: cluster annotations: include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" release.openshift.io/create-only: "true" spec: {} diff --git a/empty-resources/0000_05_config-operator_02_featuregate.cr.yaml b/empty-resources/0000_05_config-operator_02_featuregate.cr.yaml index fa2edd107..6a39de906 100644 --- a/empty-resources/0000_05_config-operator_02_featuregate.cr.yaml +++ b/empty-resources/0000_05_config-operator_02_featuregate.cr.yaml @@ -4,5 +4,6 @@ metadata: name: cluster annotations: include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" release.openshift.io/create-only: "true" spec: {} diff --git a/empty-resources/0000_05_config-operator_02_image.cr.yaml b/empty-resources/0000_05_config-operator_02_image.cr.yaml index eeed50031..c51bb1577 100644 --- a/empty-resources/0000_05_config-operator_02_image.cr.yaml +++ b/empty-resources/0000_05_config-operator_02_image.cr.yaml @@ -4,5 +4,6 @@ metadata: name: cluster annotations: include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" release.openshift.io/create-only: "true" spec: {} diff --git a/empty-resources/0000_05_config-operator_02_infrastructure.cr.yaml b/empty-resources/0000_05_config-operator_02_infrastructure.cr.yaml index ec32770dc..7b407063e 100644 --- a/empty-resources/0000_05_config-operator_02_infrastructure.cr.yaml +++ b/empty-resources/0000_05_config-operator_02_infrastructure.cr.yaml @@ -4,5 +4,6 @@ metadata: name: cluster annotations: include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" release.openshift.io/create-only: "true" spec: {} diff --git a/empty-resources/0000_05_config-operator_02_ingress.cr.yaml b/empty-resources/0000_05_config-operator_02_ingress.cr.yaml index 4c4d9d285..4c87a0efa 100644 --- a/empty-resources/0000_05_config-operator_02_ingress.cr.yaml +++ b/empty-resources/0000_05_config-operator_02_ingress.cr.yaml @@ -4,5 +4,6 @@ metadata: name: cluster annotations: include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" release.openshift.io/create-only: "true" spec: {} diff --git a/empty-resources/0000_05_config-operator_02_network.cr.yaml b/empty-resources/0000_05_config-operator_02_network.cr.yaml index 4fe584385..d270a1550 100644 --- a/empty-resources/0000_05_config-operator_02_network.cr.yaml +++ b/empty-resources/0000_05_config-operator_02_network.cr.yaml @@ -4,5 +4,6 @@ metadata: name: cluster annotations: include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" release.openshift.io/create-only: "true" spec: {} diff --git a/empty-resources/0000_05_config-operator_02_oauth.cr.yaml b/empty-resources/0000_05_config-operator_02_oauth.cr.yaml index b778d4b92..3849948bd 100644 --- a/empty-resources/0000_05_config-operator_02_oauth.cr.yaml +++ b/empty-resources/0000_05_config-operator_02_oauth.cr.yaml @@ -4,5 +4,6 @@ metadata: name: cluster annotations: include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" release.openshift.io/create-only: "true" spec: {} diff --git a/empty-resources/0000_05_config-operator_02_operatorhub.cr.yaml b/empty-resources/0000_05_config-operator_02_operatorhub.cr.yaml index 8c9d7cbfe..0ba65b38f 100644 --- a/empty-resources/0000_05_config-operator_02_operatorhub.cr.yaml +++ b/empty-resources/0000_05_config-operator_02_operatorhub.cr.yaml @@ -4,5 +4,6 @@ metadata: name: cluster annotations: include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" release.openshift.io/create-only: "true" spec: {} diff --git a/empty-resources/0000_05_config-operator_02_project.cr.yaml b/empty-resources/0000_05_config-operator_02_project.cr.yaml index f4bef2670..669039fcb 100644 --- a/empty-resources/0000_05_config-operator_02_project.cr.yaml +++ b/empty-resources/0000_05_config-operator_02_project.cr.yaml @@ -4,5 +4,6 @@ metadata: name: cluster annotations: include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" release.openshift.io/create-only: "true" spec: {} diff --git a/empty-resources/0000_05_config-operator_02_proxy.cr.yaml b/empty-resources/0000_05_config-operator_02_proxy.cr.yaml index 809a51328..983fe2ad4 100644 --- a/empty-resources/0000_05_config-operator_02_proxy.cr.yaml +++ b/empty-resources/0000_05_config-operator_02_proxy.cr.yaml @@ -4,5 +4,6 @@ metadata: name: cluster annotations: include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" release.openshift.io/create-only: "true" spec: {} diff --git a/empty-resources/0000_05_config-operator_02_scheduler.cr.yaml b/empty-resources/0000_05_config-operator_02_scheduler.cr.yaml index 1dec88cd0..988524253 100644 --- a/empty-resources/0000_05_config-operator_02_scheduler.cr.yaml +++ b/empty-resources/0000_05_config-operator_02_scheduler.cr.yaml @@ -4,5 +4,6 @@ metadata: name: cluster annotations: include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" release.openshift.io/create-only: "true" spec: {} diff --git a/manifests/0000_10_config-operator_01_openshift-config-managed-ns.yaml b/manifests/0000_10_config-operator_01_openshift-config-managed-ns.yaml index aa14a09a1..9b95a2303 100644 --- a/manifests/0000_10_config-operator_01_openshift-config-managed-ns.yaml +++ b/manifests/0000_10_config-operator_01_openshift-config-managed-ns.yaml @@ -3,6 +3,7 @@ kind: Namespace metadata: annotations: include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" openshift.io/node-selector: "" name: openshift-config-managed labels: diff --git a/manifests/0000_10_config-operator_01_openshift-config-ns.yaml b/manifests/0000_10_config-operator_01_openshift-config-ns.yaml index 94c3a2463..68096719d 100644 --- a/manifests/0000_10_config-operator_01_openshift-config-ns.yaml +++ b/manifests/0000_10_config-operator_01_openshift-config-ns.yaml @@ -3,6 +3,7 @@ kind: Namespace metadata: annotations: include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" openshift.io/node-selector: "" name: openshift-config labels: diff --git a/manifests/0000_10_config-operator_02_config.clusterrole.yaml b/manifests/0000_10_config-operator_02_config.clusterrole.yaml index 5bc12e5f8..3a40369e8 100644 --- a/manifests/0000_10_config-operator_02_config.clusterrole.yaml +++ b/manifests/0000_10_config-operator_02_config.clusterrole.yaml @@ -3,6 +3,7 @@ kind: ClusterRole metadata: annotations: include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" labels: rbac.authorization.k8s.io/aggregate-to-cluster-reader: "true" name: system:openshift:cluster-config-operator:cluster-reader diff --git a/manifests/0000_30_config-operator_00_namespace.yaml b/manifests/0000_30_config-operator_00_namespace.yaml index ca8463f4e..a33957d64 100644 --- a/manifests/0000_30_config-operator_00_namespace.yaml +++ b/manifests/0000_30_config-operator_00_namespace.yaml @@ -3,6 +3,7 @@ kind: Namespace metadata: annotations: include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" openshift.io/node-selector: "" labels: openshift.io/cluster-monitoring: "true" diff --git a/manifests/0000_30_config-operator_01_operator.cr.yaml b/manifests/0000_30_config-operator_01_operator.cr.yaml index 7f4a9855b..14c11fcfe 100644 --- a/manifests/0000_30_config-operator_01_operator.cr.yaml +++ b/manifests/0000_30_config-operator_01_operator.cr.yaml @@ -4,6 +4,7 @@ metadata: name: cluster annotations: 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_config-operator_01_prometheusrole.yaml b/manifests/0000_30_config-operator_01_prometheusrole.yaml index 0fd8a7c06..4edcb7186 100644 --- a/manifests/0000_30_config-operator_01_prometheusrole.yaml +++ b/manifests/0000_30_config-operator_01_prometheusrole.yaml @@ -6,6 +6,7 @@ metadata: namespace: openshift-config-operator annotations: include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" rules: - apiGroups: - "" diff --git a/manifests/0000_30_config-operator_02_prometheusrolebinding.yaml b/manifests/0000_30_config-operator_02_prometheusrolebinding.yaml index b74651168..1912e4b93 100644 --- a/manifests/0000_30_config-operator_02_prometheusrolebinding.yaml +++ b/manifests/0000_30_config-operator_02_prometheusrolebinding.yaml @@ -5,6 +5,7 @@ metadata: namespace: openshift-config-operator annotations: 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_30_config-operator_02_service.yaml b/manifests/0000_30_config-operator_02_service.yaml index 9a178c8d7..c03f1feed 100644 --- a/manifests/0000_30_config-operator_02_service.yaml +++ b/manifests/0000_30_config-operator_02_service.yaml @@ -3,6 +3,7 @@ kind: Service metadata: annotations: 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: config-operator-serving-cert labels: app: openshift-config-operator diff --git a/manifests/0000_30_config-operator_03_servicemonitor.yaml b/manifests/0000_30_config-operator_03_servicemonitor.yaml index 4fdf15b27..8f445ed92 100644 --- a/manifests/0000_30_config-operator_03_servicemonitor.yaml +++ b/manifests/0000_30_config-operator_03_servicemonitor.yaml @@ -5,6 +5,7 @@ metadata: namespace: openshift-config-operator annotations: 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_30_config-operator_04_roles.yaml b/manifests/0000_30_config-operator_04_roles.yaml index d002f759a..538b25710 100644 --- a/manifests/0000_30_config-operator_04_roles.yaml +++ b/manifests/0000_30_config-operator_04_roles.yaml @@ -4,6 +4,7 @@ metadata: name: system:openshift:operator:openshift-config-operator annotations: 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_config-operator_05_serviceaccount.yaml b/manifests/0000_30_config-operator_05_serviceaccount.yaml index 643f229c6..249379fdc 100644 --- a/manifests/0000_30_config-operator_05_serviceaccount.yaml +++ b/manifests/0000_30_config-operator_05_serviceaccount.yaml @@ -5,5 +5,6 @@ metadata: name: openshift-config-operator annotations: include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" labels: app: openshift-config-operator diff --git a/manifests/0000_30_config-operator_07_deployment.yaml b/manifests/0000_30_config-operator_07_deployment.yaml index c639e1d2a..1c7e37846 100644 --- a/manifests/0000_30_config-operator_07_deployment.yaml +++ b/manifests/0000_30_config-operator_07_deployment.yaml @@ -7,6 +7,7 @@ metadata: app: openshift-config-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_config-operator_08_clusteroperator.yaml b/manifests/0000_30_config-operator_08_clusteroperator.yaml index 6a110475a..6e54590bd 100644 --- a/manifests/0000_30_config-operator_08_clusteroperator.yaml +++ b/manifests/0000_30_config-operator_08_clusteroperator.yaml @@ -4,6 +4,7 @@ metadata: name: config-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: {} status: