From 433f1dd30d2b338d435579c02a6f8fbd1b83f577 Mon Sep 17 00:00:00 2001 From: Guillaume Rose Date: Thu, 26 Nov 2020 15:35:37 +0100 Subject: [PATCH] Annotate manifests for single-node-developer cluster profile This partially implements phase 1 of openshift/enhancements#482 and does not change behavior. Initially, all 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. --- ...0_cluster-authentication-operator_01_prometheusrbac.yaml | 6 ++++++ ...0_cluster-authentication-operator_02_servicemonitor.yaml | 3 +++ manifests/00_namespace.yaml | 1 + manifests/02_config.cr.yaml | 1 + manifests/02_service.yaml | 1 + manifests/03_configmap.yaml | 1 + manifests/03_openshift_service_ca.yaml | 1 + manifests/03_operator_trusted_ca.yaml | 1 + manifests/04_roles.yaml | 1 + manifests/05_serviceaccount.yaml | 1 + manifests/07_deployment.yaml | 1 + manifests/08_clusteroperator.yaml | 1 + manifests/09_flowschema.yaml | 4 ++++ 13 files changed, 23 insertions(+) diff --git a/manifests/0000_90_cluster-authentication-operator_01_prometheusrbac.yaml b/manifests/0000_90_cluster-authentication-operator_01_prometheusrbac.yaml index ad6d8757b7..bf82048daf 100644 --- a/manifests/0000_90_cluster-authentication-operator_01_prometheusrbac.yaml +++ b/manifests/0000_90_cluster-authentication-operator_01_prometheusrbac.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: - "" @@ -28,6 +29,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: - "" @@ -49,6 +51,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: - "" @@ -70,6 +73,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 @@ -88,6 +92,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 @@ -106,6 +111,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_cluster-authentication-operator_02_servicemonitor.yaml b/manifests/0000_90_cluster-authentication-operator_02_servicemonitor.yaml index c91c58a1fd..d77a0ebc42 100644 --- a/manifests/0000_90_cluster-authentication-operator_02_servicemonitor.yaml +++ b/manifests/0000_90_cluster-authentication-operator_02_servicemonitor.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" spec: endpoints: - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token @@ -36,6 +37,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 @@ -64,6 +66,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/00_namespace.yaml b/manifests/00_namespace.yaml index fae8b7866e..19805a2fd7 100644 --- a/manifests/00_namespace.yaml +++ b/manifests/00_namespace.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" openshift.io/node-selector: "" labels: openshift.io/cluster-monitoring: "true" diff --git a/manifests/02_config.cr.yaml b/manifests/02_config.cr.yaml index bdf4ae5f9c..e0e5de6410 100644 --- a/manifests/02_config.cr.yaml +++ b/manifests/02_config.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/02_service.yaml b/manifests/02_service.yaml index 33e4c4e960..363f246dc4 100644 --- a/manifests/02_service.yaml +++ b/manifests/02_service.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" service.alpha.openshift.io/serving-cert-secret-name: serving-cert labels: app: authentication-operator diff --git a/manifests/03_configmap.yaml b/manifests/03_configmap.yaml index dc252acefa..be56b6a891 100644 --- a/manifests/03_configmap.yaml +++ b/manifests/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: operator-config.yaml: | apiVersion: operator.openshift.io/v1alpha1 diff --git a/manifests/03_openshift_service_ca.yaml b/manifests/03_openshift_service_ca.yaml index dc4036519b..cacc6f6dca 100644 --- a/manifests/03_openshift_service_ca.yaml +++ b/manifests/03_openshift_service_ca.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" service.beta.openshift.io/inject-cabundle: "true" data: {} diff --git a/manifests/03_operator_trusted_ca.yaml b/manifests/03_operator_trusted_ca.yaml index c2ebcf09de..9e15ff07a0 100644 --- a/manifests/03_operator_trusted_ca.yaml +++ b/manifests/03_operator_trusted_ca.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/04_roles.yaml b/manifests/04_roles.yaml index 594e8d5503..48b316eb58 100644 --- a/manifests/04_roles.yaml +++ b/manifests/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 # TODO fix, this is madness diff --git a/manifests/05_serviceaccount.yaml b/manifests/05_serviceaccount.yaml index a89b35ccd0..a376290c4a 100644 --- a/manifests/05_serviceaccount.yaml +++ b/manifests/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: authentication-operator diff --git a/manifests/07_deployment.yaml b/manifests/07_deployment.yaml index 86512f2601..ffa9a340a4 100644 --- a/manifests/07_deployment.yaml +++ b/manifests/07_deployment.yaml @@ -7,6 +7,7 @@ metadata: app: authentication-operator annotations: include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" config.openshift.io/inject-proxy: authentication-operator exclude.release.openshift.io/internal-openshift-hosted: "true" spec: diff --git a/manifests/08_clusteroperator.yaml b/manifests/08_clusteroperator.yaml index ec3c4660ef..cec349fa7c 100644 --- a/manifests/08_clusteroperator.yaml +++ b/manifests/08_clusteroperator.yaml @@ -4,6 +4,7 @@ metadata: name: authentication 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" status: versions: diff --git a/manifests/09_flowschema.yaml b/manifests/09_flowschema.yaml index 1bc3c8b50c..92941eaba2 100644 --- a/manifests/09_flowschema.yaml +++ b/manifests/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 @@ -104,6 +107,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