diff --git a/manifests/0000_90_cluster-image-registry-operator_00_servicemonitor-rbac.yaml b/manifests/0000_90_cluster-image-registry-operator_00_servicemonitor-rbac.yaml index b9ce980ae1..f93e767d20 100644 --- a/manifests/0000_90_cluster-image-registry-operator_00_servicemonitor-rbac.yaml +++ b/manifests/0000_90_cluster-image-registry-operator_00_servicemonitor-rbac.yaml @@ -3,6 +3,8 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: name: registry-monitoring + annotations: + include.release.openshift.io/self-managed-high-availability: "true" rules: - apiGroups: - image.openshift.io @@ -15,6 +17,8 @@ kind: ClusterRoleBinding apiVersion: rbac.authorization.k8s.io/v1 metadata: name: registry-monitoring + annotations: + include.release.openshift.io/self-managed-high-availability: "true" subjects: - kind: ServiceAccount name: prometheus-k8s @@ -30,6 +34,8 @@ metadata: # TODO this should be a clusterrole name: prometheus-k8s namespace: openshift-image-registry + annotations: + include.release.openshift.io/self-managed-high-availability: "true" rules: - apiGroups: - "" @@ -47,6 +53,8 @@ kind: RoleBinding metadata: name: prometheus-k8s namespace: openshift-image-registry + annotations: + include.release.openshift.io/self-managed-high-availability: "true" roleRef: apiGroup: rbac.authorization.k8s.io kind: Role diff --git a/manifests/0000_90_cluster-image-registry-operator_01_operand-servicemonitor.yaml b/manifests/0000_90_cluster-image-registry-operator_01_operand-servicemonitor.yaml index a50302e4fd..727b8ab6f3 100644 --- a/manifests/0000_90_cluster-image-registry-operator_01_operand-servicemonitor.yaml +++ b/manifests/0000_90_cluster-image-registry-operator_01_operand-servicemonitor.yaml @@ -4,6 +4,8 @@ kind: ServiceMonitor metadata: name: image-registry namespace: openshift-image-registry + 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_cluster-image-registry-operator_02_operator-servicemonitor.yaml b/manifests/0000_90_cluster-image-registry-operator_02_operator-servicemonitor.yaml index 7889ea7208..31d12cf196 100644 --- a/manifests/0000_90_cluster-image-registry-operator_02_operator-servicemonitor.yaml +++ b/manifests/0000_90_cluster-image-registry-operator_02_operator-servicemonitor.yaml @@ -4,6 +4,8 @@ kind: ServiceMonitor metadata: name: image-registry-operator namespace: openshift-image-registry + annotations: + include.release.openshift.io/self-managed-high-availability: "true" spec: endpoints: - targetPort: 60000 diff --git a/manifests/01-namespace.yaml b/manifests/01-namespace.yaml index 2452831bc4..2f9895bdf4 100644 --- a/manifests/01-namespace.yaml +++ b/manifests/01-namespace.yaml @@ -4,6 +4,7 @@ kind: Namespace metadata: name: openshift-image-registry annotations: + include.release.openshift.io/self-managed-high-availability: "true" openshift.io/node-selector: "" labels: openshift.io/cluster-monitoring: "true" diff --git a/manifests/01-registry-credentials-request-azure.yaml b/manifests/01-registry-credentials-request-azure.yaml index 4af6aee558..f70d13a039 100644 --- a/manifests/01-registry-credentials-request-azure.yaml +++ b/manifests/01-registry-credentials-request-azure.yaml @@ -5,6 +5,8 @@ metadata: controller-tools.k8s.io: "1.0" name: openshift-image-registry-azure namespace: openshift-cloud-credential-operator + annotations: + include.release.openshift.io/self-managed-high-availability: "true" spec: secretRef: name: installer-cloud-credentials diff --git a/manifests/01-registry-credentials-request-gcs.yaml b/manifests/01-registry-credentials-request-gcs.yaml index 0505515693..572ba75974 100644 --- a/manifests/01-registry-credentials-request-gcs.yaml +++ b/manifests/01-registry-credentials-request-gcs.yaml @@ -5,6 +5,8 @@ metadata: controller-tools.k8s.io: "1.0" name: openshift-image-registry-gcs namespace: openshift-cloud-credential-operator + annotations: + include.release.openshift.io/self-managed-high-availability: "true" spec: secretRef: name: installer-cloud-credentials diff --git a/manifests/01-registry-credentials-request-openstack.yaml b/manifests/01-registry-credentials-request-openstack.yaml index fd9bc54a35..25761c973d 100644 --- a/manifests/01-registry-credentials-request-openstack.yaml +++ b/manifests/01-registry-credentials-request-openstack.yaml @@ -5,6 +5,8 @@ metadata: controller-tools.k8s.io: "1.0" name: openshift-image-registry-openstack namespace: openshift-cloud-credential-operator + annotations: + include.release.openshift.io/self-managed-high-availability: "true" spec: secretRef: name: installer-cloud-credentials diff --git a/manifests/01-registry-credentials-request.yaml b/manifests/01-registry-credentials-request.yaml index 2dbb62fe89..567593873b 100644 --- a/manifests/01-registry-credentials-request.yaml +++ b/manifests/01-registry-credentials-request.yaml @@ -5,6 +5,8 @@ metadata: controller-tools.k8s.io: "1.0" name: openshift-image-registry namespace: openshift-cloud-credential-operator + annotations: + include.release.openshift.io/self-managed-high-availability: "true" spec: secretRef: name: installer-cloud-credentials diff --git a/manifests/02-rbac.yaml b/manifests/02-rbac.yaml index 93e7489962..07a0ae0feb 100644 --- a/manifests/02-rbac.yaml +++ b/manifests/02-rbac.yaml @@ -3,6 +3,8 @@ kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: name: cluster-image-registry-operator + annotations: + include.release.openshift.io/self-managed-high-availability: "true" rules: - apiGroups: - imageregistry.operator.openshift.io @@ -120,6 +122,8 @@ kind: ClusterRoleBinding apiVersion: rbac.authorization.k8s.io/v1 metadata: name: default-account-cluster-image-registry-operator + annotations: + include.release.openshift.io/self-managed-high-availability: "true" subjects: - kind: ServiceAccount name: cluster-image-registry-operator diff --git a/manifests/03-sa.yaml b/manifests/03-sa.yaml index 4fe26e2e4e..a09eb75681 100644 --- a/manifests/03-sa.yaml +++ b/manifests/03-sa.yaml @@ -4,3 +4,5 @@ kind: ServiceAccount metadata: name: cluster-image-registry-operator namespace: openshift-image-registry + annotations: + include.release.openshift.io/self-managed-high-availability: "true" diff --git a/manifests/04-ca-trusted.yaml b/manifests/04-ca-trusted.yaml index 1556aaa2f4..8ca6e190f0 100644 --- a/manifests/04-ca-trusted.yaml +++ b/manifests/04-ca-trusted.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: ConfigMap metadata: annotations: + include.release.openshift.io/self-managed-high-availability: "true" release.openshift.io/create-only: "true" labels: config.openshift.io/inject-trusted-cabundle: "true" diff --git a/manifests/05-ca-rbac.yaml b/manifests/05-ca-rbac.yaml index f1578126b2..1857bd8e1c 100644 --- a/manifests/05-ca-rbac.yaml +++ b/manifests/05-ca-rbac.yaml @@ -4,6 +4,8 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: node-ca namespace: openshift-image-registry + annotations: + include.release.openshift.io/self-managed-high-availability: "true" rules: - apiGroups: - security.openshift.io @@ -19,6 +21,8 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: node-ca namespace: openshift-image-registry + annotations: + include.release.openshift.io/self-managed-high-availability: "true" subjects: - kind: ServiceAccount name: node-ca diff --git a/manifests/06-ca-serviceaccount.yaml b/manifests/06-ca-serviceaccount.yaml index 09914a936e..a62ec255ae 100644 --- a/manifests/06-ca-serviceaccount.yaml +++ b/manifests/06-ca-serviceaccount.yaml @@ -4,3 +4,5 @@ kind: ServiceAccount metadata: name: node-ca namespace: openshift-image-registry + annotations: + include.release.openshift.io/self-managed-high-availability: "true" diff --git a/manifests/07-operator-service.yaml b/manifests/07-operator-service.yaml index d77179c9bd..783f8ceb71 100644 --- a/manifests/07-operator-service.yaml +++ b/manifests/07-operator-service.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: Service metadata: annotations: + include.release.openshift.io/self-managed-high-availability: "true" service.alpha.openshift.io/serving-cert-secret-name: image-registry-operator-tls labels: name: image-registry-operator diff --git a/manifests/07-operator.yaml b/manifests/07-operator.yaml index b39b6b8ffe..18d5002323 100644 --- a/manifests/07-operator.yaml +++ b/manifests/07-operator.yaml @@ -5,7 +5,8 @@ metadata: name: cluster-image-registry-operator namespace: openshift-image-registry annotations: - config.openshift.io/inject-proxy: cluster-image-registry-operator + config.openshift.io/inject-proxy: cluster-image-registry-operator + include.release.openshift.io/self-managed-high-availability: "true" spec: replicas: 1 selector: diff --git a/manifests/08-clusteroperator.yaml b/manifests/08-clusteroperator.yaml index 8de89260d6..3139a911e3 100644 --- a/manifests/08-clusteroperator.yaml +++ b/manifests/08-clusteroperator.yaml @@ -2,6 +2,8 @@ apiVersion: config.openshift.io/v1 kind: ClusterOperator metadata: name: image-registry + annotations: + include.release.openshift.io/self-managed-high-availability: "true" spec: {} status: versions: diff --git a/manifests/09-prometheus-rules.yaml b/manifests/09-prometheus-rules.yaml index d2d92964d0..4967484ba7 100644 --- a/manifests/09-prometheus-rules.yaml +++ b/manifests/09-prometheus-rules.yaml @@ -5,6 +5,8 @@ metadata: name: image-registry-operator-alerts name: image-registry-operator-alerts namespace: openshift-image-registry + annotations: + include.release.openshift.io/self-managed-high-availability: "true" spec: groups: - name: ImageRegistryOperator