diff --git a/manifests/0000_12_etcd-operator_00_namespace.yaml b/manifests/0000_12_etcd-operator_00_namespace.yaml index 75eb2e5c8..fcfbbcc41 100644 --- a/manifests/0000_12_etcd-operator_00_namespace.yaml +++ b/manifests/0000_12_etcd-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/run-level: "0" diff --git a/manifests/0000_12_etcd-operator_01_config.crd.yaml b/manifests/0000_12_etcd-operator_01_config.crd.yaml index 136c1de65..5d0ae218f 100644 --- a/manifests/0000_12_etcd-operator_01_config.crd.yaml +++ b/manifests/0000_12_etcd-operator_01_config.crd.yaml @@ -2,6 +2,8 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: etcds.operator.openshift.io + annotations: + include.release.openshift.io/self-managed-high-availability: "true" spec: scope: Cluster group: operator.openshift.io diff --git a/manifests/0000_12_etcd-operator_01_operator.cr.yaml b/manifests/0000_12_etcd-operator_01_operator.cr.yaml index f19173036..1dc8c1816 100644 --- a/manifests/0000_12_etcd-operator_01_operator.cr.yaml +++ b/manifests/0000_12_etcd-operator_01_operator.cr.yaml @@ -3,6 +3,7 @@ kind: Etcd metadata: name: cluster annotations: + include.release.openshift.io/self-managed-high-availability: "true" release.openshift.io/create-only: "true" spec: managementState: Managed diff --git a/manifests/0000_12_etcd-operator_02_service.yaml b/manifests/0000_12_etcd-operator_02_service.yaml index 576605c02..dcbd9fe3c 100644 --- a/manifests/0000_12_etcd-operator_02_service.yaml +++ b/manifests/0000_12_etcd-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: etcd-operator-serving-cert labels: app: etcd-operator diff --git a/manifests/0000_12_etcd-operator_03_configmap.yaml b/manifests/0000_12_etcd-operator_03_configmap.yaml index 3d0ca04fa..491f0267e 100644 --- a/manifests/0000_12_etcd-operator_03_configmap.yaml +++ b/manifests/0000_12_etcd-operator_03_configmap.yaml @@ -3,6 +3,8 @@ kind: ConfigMap metadata: namespace: openshift-etcd-operator name: etcd-operator-config + annotations: + include.release.openshift.io/self-managed-high-availability: "true" data: config.yaml: | apiVersion: operator.openshift.io/v1alpha1 @@ -12,6 +14,7 @@ apiVersion: v1 kind: ConfigMap metadata: annotations: + include.release.openshift.io/self-managed-high-availability: "true" release.openshift.io/create-only: "true" name: etcd-ca-bundle namespace: openshift-etcd-operator @@ -20,6 +23,7 @@ apiVersion: v1 kind: ConfigMap metadata: annotations: + include.release.openshift.io/self-managed-high-availability: "true" release.openshift.io/create-only: "true" service.beta.openshift.io/inject-cabundle: "true" name: etcd-service-ca-bundle diff --git a/manifests/0000_12_etcd-operator_03_secret.yaml b/manifests/0000_12_etcd-operator_03_secret.yaml index 437487c0b..3f18b93b4 100644 --- a/manifests/0000_12_etcd-operator_03_secret.yaml +++ b/manifests/0000_12_etcd-operator_03_secret.yaml @@ -3,6 +3,7 @@ kind: Secret type: SecretTypeTLS metadata: annotations: + include.release.openshift.io/self-managed-high-availability: "true" release.openshift.io/create-only: "true" name: etcd-client namespace: openshift-etcd-operator diff --git a/manifests/0000_12_etcd-operator_04_clusterrolebinding.yaml b/manifests/0000_12_etcd-operator_04_clusterrolebinding.yaml index 08bc3082e..1464090b9 100644 --- a/manifests/0000_12_etcd-operator_04_clusterrolebinding.yaml +++ b/manifests/0000_12_etcd-operator_04_clusterrolebinding.yaml @@ -2,6 +2,8 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: system:openshift:operator:etcd-operator + annotations: + include.release.openshift.io/self-managed-high-availability: "true" roleRef: kind: ClusterRole name: cluster-admin diff --git a/manifests/0000_12_etcd-operator_05_serviceaccount.yaml b/manifests/0000_12_etcd-operator_05_serviceaccount.yaml index 53baba8af..c562eff87 100644 --- a/manifests/0000_12_etcd-operator_05_serviceaccount.yaml +++ b/manifests/0000_12_etcd-operator_05_serviceaccount.yaml @@ -3,3 +3,5 @@ kind: ServiceAccount metadata: namespace: openshift-etcd-operator name: etcd-operator + annotations: + include.release.openshift.io/self-managed-high-availability: "true" diff --git a/manifests/0000_12_etcd-operator_06_deployment.yaml b/manifests/0000_12_etcd-operator_06_deployment.yaml index 9ddb4491c..b5f833a55 100644 --- a/manifests/0000_12_etcd-operator_06_deployment.yaml +++ b/manifests/0000_12_etcd-operator_06_deployment.yaml @@ -4,6 +4,7 @@ metadata: namespace: openshift-etcd-operator name: etcd-operator annotations: + include.release.openshift.io/self-managed-high-availability: "true" exclude.release.openshift.io/internal-openshift-hosted: "true" labels: app: etcd-operator diff --git a/manifests/0000_12_etcd-operator_07_clusteroperator.yaml b/manifests/0000_12_etcd-operator_07_clusteroperator.yaml index 8fe76c64e..847dcfb07 100644 --- a/manifests/0000_12_etcd-operator_07_clusteroperator.yaml +++ b/manifests/0000_12_etcd-operator_07_clusteroperator.yaml @@ -3,6 +3,7 @@ kind: ClusterOperator metadata: name: etcd annotations: + include.release.openshift.io/self-managed-high-availability: "true" exclude.release.openshift.io/internal-openshift-hosted: "true" spec: {} status: diff --git a/manifests/0000_12_etcd-operator_08_etcdquorumguard_deployment.yaml b/manifests/0000_12_etcd-operator_08_etcdquorumguard_deployment.yaml index 18db8fc25..06dbb88b0 100644 --- a/manifests/0000_12_etcd-operator_08_etcdquorumguard_deployment.yaml +++ b/manifests/0000_12_etcd-operator_08_etcdquorumguard_deployment.yaml @@ -4,6 +4,7 @@ metadata: name: etcd-quorum-guard namespace: openshift-etcd annotations: + include.release.openshift.io/self-managed-high-availability: "true" exclude.release.openshift.io/internal-openshift-hosted: "true" spec: replicas: 3 diff --git a/manifests/0000_12_etcd-operator_09_etcdquorumguard_pdb.yaml b/manifests/0000_12_etcd-operator_09_etcdquorumguard_pdb.yaml index 7077220fc..0e5e0db2f 100644 --- a/manifests/0000_12_etcd-operator_09_etcdquorumguard_pdb.yaml +++ b/manifests/0000_12_etcd-operator_09_etcdquorumguard_pdb.yaml @@ -4,6 +4,7 @@ metadata: namespace: openshift-etcd name: etcd-quorum-guard annotations: + include.release.openshift.io/self-managed-high-availability: "true" exclude.release.openshift.io/internal-openshift-hosted: "true" spec: maxUnavailable: 1 diff --git a/manifests/0000_90_etcd-operator_01_prometheusrole.yaml b/manifests/0000_90_etcd-operator_01_prometheusrole.yaml index d0d1ed5f9..c898f0a96 100644 --- a/manifests/0000_90_etcd-operator_01_prometheusrole.yaml +++ b/manifests/0000_90_etcd-operator_01_prometheusrole.yaml @@ -4,6 +4,8 @@ metadata: # TODO this should be a clusterrole name: prometheus-k8s namespace: openshift-etcd-operator + annotations: + include.release.openshift.io/self-managed-high-availability: "true" rules: - apiGroups: - "" diff --git a/manifests/0000_90_etcd-operator_02_prometheusrolebinding.yaml b/manifests/0000_90_etcd-operator_02_prometheusrolebinding.yaml index 8e873172c..6a9c1f6d4 100644 --- a/manifests/0000_90_etcd-operator_02_prometheusrolebinding.yaml +++ b/manifests/0000_90_etcd-operator_02_prometheusrolebinding.yaml @@ -3,6 +3,8 @@ kind: RoleBinding metadata: name: prometheus-k8s namespace: openshift-etcd-operator + annotations: + include.release.openshift.io/self-managed-high-availability: "true" roleRef: apiGroup: rbac.authorization.k8s.io kind: Role diff --git a/manifests/0000_90_etcd-operator_03_servicemonitor.yaml b/manifests/0000_90_etcd-operator_03_servicemonitor.yaml index 38903b052..13f35f25a 100644 --- a/manifests/0000_90_etcd-operator_03_servicemonitor.yaml +++ b/manifests/0000_90_etcd-operator_03_servicemonitor.yaml @@ -3,6 +3,8 @@ kind: ServiceMonitor metadata: name: etcd-operator namespace: openshift-etcd-operator + annotations: + include.release.openshift.io/self-managed-high-availability: "true" spec: endpoints: - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token