From 0b23be2e9a83c0ede08a818aab7e51da89ab4b38 Mon Sep 17 00:00:00 2001 From: David Eads Date: Mon, 24 Aug 2020 11:37:35 -0400 Subject: [PATCH] bug 1871890: add current profile annotations to CVO manifests This is matches https://github.com/openshift/enhancements/pull/414 and doesn't change existing behavior --- ...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 | 2 ++ manifests/0000_30_config-operator_00_namespace.yaml | 1 + manifests/0000_30_config-operator_01_operator.cr.yaml | 3 ++- manifests/0000_30_config-operator_01_prometheusrole.yaml | 2 ++ .../0000_30_config-operator_02_prometheusrolebinding.yaml | 2 ++ manifests/0000_30_config-operator_02_service.yaml | 1 + manifests/0000_30_config-operator_03_servicemonitor.yaml | 2 ++ manifests/0000_30_config-operator_04_roles.yaml | 2 ++ manifests/0000_30_config-operator_05_serviceaccount.yaml | 2 ++ manifests/0000_30_config-operator_07_deployment.yaml | 1 + manifests/0000_30_config-operator_08_clusteroperator.yaml | 1 + 13 files changed, 20 insertions(+), 1 deletion(-) 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 3a8f85498..aa14a09a1 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 @@ -2,6 +2,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: + include.release.openshift.io/self-managed-high-availability: "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 cd2ad8d67..94c3a2463 100644 --- a/manifests/0000_10_config-operator_01_openshift-config-ns.yaml +++ b/manifests/0000_10_config-operator_01_openshift-config-ns.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: + include.release.openshift.io/self-managed-high-availability: "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 0f723faa5..5bc12e5f8 100644 --- a/manifests/0000_10_config-operator_02_config.clusterrole.yaml +++ b/manifests/0000_10_config-operator_02_config.clusterrole.yaml @@ -1,6 +1,8 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: + annotations: + include.release.openshift.io/self-managed-high-availability: "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 0a80e8097..ca8463f4e 100644 --- a/manifests/0000_30_config-operator_00_namespace.yaml +++ b/manifests/0000_30_config-operator_00_namespace.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: Namespace metadata: annotations: + include.release.openshift.io/self-managed-high-availability: "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 d8dbaedb4..7f4a9855b 100644 --- a/manifests/0000_30_config-operator_01_operator.cr.yaml +++ b/manifests/0000_30_config-operator_01_operator.cr.yaml @@ -3,6 +3,7 @@ kind: Config metadata: name: cluster annotations: + include.release.openshift.io/self-managed-high-availability: "true" release.openshift.io/create-only: "true" spec: - managementState: Managed \ No newline at end of file + managementState: Managed diff --git a/manifests/0000_30_config-operator_01_prometheusrole.yaml b/manifests/0000_30_config-operator_01_prometheusrole.yaml index 1b4829f9b..0fd8a7c06 100644 --- a/manifests/0000_30_config-operator_01_prometheusrole.yaml +++ b/manifests/0000_30_config-operator_01_prometheusrole.yaml @@ -4,6 +4,8 @@ metadata: # TODO this should be a clusterrole name: prometheus-k8s namespace: openshift-config-operator + annotations: + include.release.openshift.io/self-managed-high-availability: "true" rules: - apiGroups: - "" diff --git a/manifests/0000_30_config-operator_02_prometheusrolebinding.yaml b/manifests/0000_30_config-operator_02_prometheusrolebinding.yaml index e2291d109..b74651168 100644 --- a/manifests/0000_30_config-operator_02_prometheusrolebinding.yaml +++ b/manifests/0000_30_config-operator_02_prometheusrolebinding.yaml @@ -3,6 +3,8 @@ kind: RoleBinding metadata: name: prometheus-k8s namespace: openshift-config-operator + annotations: + include.release.openshift.io/self-managed-high-availability: "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 9f64230a7..9a178c8d7 100644 --- a/manifests/0000_30_config-operator_02_service.yaml +++ b/manifests/0000_30_config-operator_02_service.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: Service metadata: annotations: + include.release.openshift.io/self-managed-high-availability: "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 c4ae86e6d..4fdf15b27 100644 --- a/manifests/0000_30_config-operator_03_servicemonitor.yaml +++ b/manifests/0000_30_config-operator_03_servicemonitor.yaml @@ -3,6 +3,8 @@ kind: ServiceMonitor metadata: name: config-operator namespace: openshift-config-operator + annotations: + include.release.openshift.io/self-managed-high-availability: "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 b5aadc23d..d002f759a 100644 --- a/manifests/0000_30_config-operator_04_roles.yaml +++ b/manifests/0000_30_config-operator_04_roles.yaml @@ -2,6 +2,8 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: system:openshift:operator:openshift-config-operator + annotations: + include.release.openshift.io/self-managed-high-availability: "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 738aa4a8a..643f229c6 100644 --- a/manifests/0000_30_config-operator_05_serviceaccount.yaml +++ b/manifests/0000_30_config-operator_05_serviceaccount.yaml @@ -3,5 +3,7 @@ kind: ServiceAccount metadata: namespace: openshift-config-operator name: openshift-config-operator + annotations: + include.release.openshift.io/self-managed-high-availability: "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 125c268ae..c639e1d2a 100644 --- a/manifests/0000_30_config-operator_07_deployment.yaml +++ b/manifests/0000_30_config-operator_07_deployment.yaml @@ -6,6 +6,7 @@ metadata: labels: app: openshift-config-operator annotations: + include.release.openshift.io/self-managed-high-availability: "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 2d097a0eb..6a110475a 100644 --- a/manifests/0000_30_config-operator_08_clusteroperator.yaml +++ b/manifests/0000_30_config-operator_08_clusteroperator.yaml @@ -3,6 +3,7 @@ kind: ClusterOperator metadata: name: config-operator annotations: + include.release.openshift.io/self-managed-high-availability: "true" exclude.release.openshift.io/internal-openshift-hosted: "true" spec: {} status: