openshift · openshift-merge-robot · Sep 23, 2020 · Aug 24, 2020
diff --git a/go.sum b/go.sum
@@ -350,7 +350,6 @@ github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1Cpa
 github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
 github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
 github.com/opencontainers/runc v0.0.0-20191031171055-b133feaeeb2e/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
-github.com/openshift/api v0.0.0-20200827090112-c05698d102cf h1:s/d912Y7MW7bD/6XNL0gMe6lC0zPiDjq5w8u0OyCSpc=
 github.com/openshift/api v0.0.0-20200827090112-c05698d102cf/go.mod h1:M3xexPhgM8DISzzRpuFUy+jfPjQPIcs9yqEYj17mXV8=
 github.com/openshift/api v0.0.0-20200901182017-7ac89ba6b971 h1:l4jU2pbYCFlWffDL8gQaN24UohhHI8Zq/zmiSpYzy7o=
 github.com/openshift/api v0.0.0-20200901182017-7ac89ba6b971/go.mod h1:M3xexPhgM8DISzzRpuFUy+jfPjQPIcs9yqEYj17mXV8=

diff --git a/manifests/0000_25_kube-controller-manager-operator_00_namespace.yaml b/manifests/0000_25_kube-controller-manager-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_25_kube-controller-manager-operator_01_operator.cr.yaml b/manifests/0000_25_kube-controller-manager-operator_01_operator.cr.yaml
@@ -3,6 +3,7 @@ kind: KubeControllerManager
 metadata:
   name: cluster
   annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
     release.openshift.io/create-only: "true"
 spec:
-  managementState: Managed
+  managementState: Managed
diff --git a/manifests/0000_25_kube-controller-manager-operator_02_service.yaml b/manifests/0000_25_kube-controller-manager-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: kube-controller-manager-operator-serving-cert
   labels:
     app: kube-controller-manager-operator

diff --git a/manifests/0000_25_kube-controller-manager-operator_03_configmap.yaml b/manifests/0000_25_kube-controller-manager-operator_03_configmap.yaml
@@ -3,6 +3,8 @@ kind: ConfigMap
 metadata:
   namespace: openshift-kube-controller-manager-operator
   name: kube-controller-manager-operator-config
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 data:
   config.yaml: |
     apiVersion: operator.openshift.io/v1

diff --git a/manifests/0000_25_kube-controller-manager-operator_04_clusterrolebinding.yaml b/manifests/0000_25_kube-controller-manager-operator_04_clusterrolebinding.yaml
@@ -2,6 +2,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: system:openshift:operator:kube-controller-manager-operator
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 roleRef:
   kind: ClusterRole
   name: cluster-admin

diff --git a/manifests/0000_25_kube-controller-manager-operator_05_serviceaccount.yaml b/manifests/0000_25_kube-controller-manager-operator_05_serviceaccount.yaml
@@ -3,3 +3,5 @@ kind: ServiceAccount
 metadata:
   namespace: openshift-kube-controller-manager-operator
   name: kube-controller-manager-operator
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
diff --git a/manifests/0000_25_kube-controller-manager-operator_06_deployment.yaml b/manifests/0000_25_kube-controller-manager-operator_06_deployment.yaml
@@ -6,6 +6,7 @@ metadata:
   labels:
     app: kube-controller-manager-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_25_kube-controller-manager-operator_07_clusteroperator.yaml b/manifests/0000_25_kube-controller-manager-operator_07_clusteroperator.yaml
@@ -3,6 +3,7 @@ kind: ClusterOperator
 metadata:
   name: kube-controller-manager
   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_90_kube-controller-manager-operator_01_prometheusrole.yaml b/manifests/0000_90_kube-controller-manager-operator_01_prometheusrole.yaml
@@ -4,6 +4,8 @@ metadata:
   # TODO this should be a clusterrole
   name: prometheus-k8s
   namespace: openshift-kube-controller-manager-operator
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 rules:
 - apiGroups:
   - ""

diff --git a/manifests/0000_90_kube-controller-manager-operator_02_prometheusrolebinding.yaml b/manifests/0000_90_kube-controller-manager-operator_02_prometheusrolebinding.yaml
@@ -3,6 +3,8 @@ kind: RoleBinding
 metadata:
   name: prometheus-k8s
   namespace: openshift-kube-controller-manager-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_kube-controller-manager-operator_03_servicemonitor.yaml b/manifests/0000_90_kube-controller-manager-operator_03_servicemonitor.yaml
@@ -3,6 +3,8 @@ kind: ServiceMonitor
 metadata:
   name: kube-controller-manager-operator
   namespace: openshift-kube-controller-manager-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_90_kube-controller-manager-operator_04_servicemonitor-controller-manager.yaml b/manifests/0000_90_kube-controller-manager-operator_04_servicemonitor-controller-manager.yaml
@@ -3,6 +3,8 @@ kind: Role
 metadata:
   name: prometheus-k8s
   namespace: openshift-kube-controller-manager
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 rules:
 - apiGroups:
   - ""

diff --git a/manifests/0000_90_kube-controller-manager-operator_05_alerts.yaml b/manifests/0000_90_kube-controller-manager-operator_05_alerts.yaml
@@ -4,6 +4,7 @@ metadata:
   name: kube-controller-manager-operator
   namespace: openshift-kube-controller-manager-operator
   annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
     exclude.release.openshift.io/internal-openshift-hosted: "true"
 spec:
   groups: