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 c4ea9748c..9b2696687 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 @@ -4,6 +4,7 @@ kind: ClusterRole metadata: name: registry-monitoring annotations: + capability.openshift.io/name: ImageRegistry 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" @@ -20,6 +21,7 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: registry-monitoring annotations: + capability.openshift.io/name: ImageRegistry 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" @@ -39,6 +41,7 @@ metadata: name: prometheus-k8s namespace: openshift-image-registry annotations: + capability.openshift.io/name: ImageRegistry 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" @@ -60,6 +63,7 @@ metadata: name: prometheus-k8s namespace: openshift-image-registry annotations: + capability.openshift.io/name: ImageRegistry 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" 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 9917c570c..29e537e7d 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 @@ -5,6 +5,7 @@ metadata: name: image-registry namespace: openshift-image-registry annotations: + capability.openshift.io/name: ImageRegistry 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" 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 35405024f..4c6710663 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 @@ -5,6 +5,7 @@ metadata: name: image-registry-operator namespace: openshift-image-registry annotations: + capability.openshift.io/name: ImageRegistry 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" diff --git a/manifests/01-namespace.yaml b/manifests/01-namespace.yaml index 1aaab4045..5348e8e3c 100644 --- a/manifests/01-namespace.yaml +++ b/manifests/01-namespace.yaml @@ -4,6 +4,7 @@ kind: Namespace metadata: name: openshift-image-registry annotations: + capability.openshift.io/name: ImageRegistry include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" openshift.io/node-selector: "" diff --git a/manifests/01-registry-credentials-request-alibaba.yaml b/manifests/01-registry-credentials-request-alibaba.yaml index 4efbdcf1a..82257ae38 100644 --- a/manifests/01-registry-credentials-request-alibaba.yaml +++ b/manifests/01-registry-credentials-request-alibaba.yaml @@ -6,6 +6,7 @@ metadata: name: openshift-image-registry-alibaba namespace: openshift-cloud-credential-operator annotations: + capability.openshift.io/name: ImageRegistry 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" diff --git a/manifests/01-registry-credentials-request-azure.yaml b/manifests/01-registry-credentials-request-azure.yaml index 13fa7b3aa..18b1f8e4f 100644 --- a/manifests/01-registry-credentials-request-azure.yaml +++ b/manifests/01-registry-credentials-request-azure.yaml @@ -6,6 +6,7 @@ metadata: name: openshift-image-registry-azure namespace: openshift-cloud-credential-operator annotations: + capability.openshift.io/name: ImageRegistry 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" diff --git a/manifests/01-registry-credentials-request-gcs.yaml b/manifests/01-registry-credentials-request-gcs.yaml index f9fef0553..634ec01de 100644 --- a/manifests/01-registry-credentials-request-gcs.yaml +++ b/manifests/01-registry-credentials-request-gcs.yaml @@ -6,6 +6,7 @@ metadata: name: openshift-image-registry-gcs namespace: openshift-cloud-credential-operator annotations: + capability.openshift.io/name: ImageRegistry 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" diff --git a/manifests/01-registry-credentials-request-ibmcos.yaml b/manifests/01-registry-credentials-request-ibmcos.yaml index 4731007eb..4c148a976 100644 --- a/manifests/01-registry-credentials-request-ibmcos.yaml +++ b/manifests/01-registry-credentials-request-ibmcos.yaml @@ -6,6 +6,7 @@ metadata: name: openshift-image-registry-ibmcos namespace: openshift-cloud-credential-operator annotations: + capability.openshift.io/name: ImageRegistry 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" diff --git a/manifests/01-registry-credentials-request-openstack.yaml b/manifests/01-registry-credentials-request-openstack.yaml index 77188caca..dc2665d7e 100644 --- a/manifests/01-registry-credentials-request-openstack.yaml +++ b/manifests/01-registry-credentials-request-openstack.yaml @@ -6,6 +6,7 @@ metadata: name: openshift-image-registry-openstack namespace: openshift-cloud-credential-operator annotations: + capability.openshift.io/name: ImageRegistry 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" diff --git a/manifests/01-registry-credentials-request.yaml b/manifests/01-registry-credentials-request.yaml index d00262233..455969813 100644 --- a/manifests/01-registry-credentials-request.yaml +++ b/manifests/01-registry-credentials-request.yaml @@ -6,6 +6,7 @@ metadata: name: openshift-image-registry namespace: openshift-cloud-credential-operator annotations: + capability.openshift.io/name: ImageRegistry 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" diff --git a/manifests/02-rbac.yaml b/manifests/02-rbac.yaml index 144ab6251..424d5690b 100644 --- a/manifests/02-rbac.yaml +++ b/manifests/02-rbac.yaml @@ -4,6 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: cluster-image-registry-operator annotations: + capability.openshift.io/name: ImageRegistry 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" @@ -104,6 +105,7 @@ metadata: name: cluster-image-registry-operator namespace: openshift-image-registry annotations: + capability.openshift.io/name: ImageRegistry 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" @@ -142,6 +144,7 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: default-account-cluster-image-registry-operator annotations: + capability.openshift.io/name: ImageRegistry 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" @@ -160,6 +163,7 @@ metadata: name: cluster-image-registry-operator namespace: openshift-image-registry annotations: + capability.openshift.io/name: ImageRegistry 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" diff --git a/manifests/03-sa.yaml b/manifests/03-sa.yaml index a912c26cb..77042a3d5 100644 --- a/manifests/03-sa.yaml +++ b/manifests/03-sa.yaml @@ -5,6 +5,7 @@ metadata: name: cluster-image-registry-operator namespace: openshift-image-registry annotations: + capability.openshift.io/name: ImageRegistry 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" diff --git a/manifests/04-ca-trusted.yaml b/manifests/04-ca-trusted.yaml index db5b341f5..1dc4d7c47 100644 --- a/manifests/04-ca-trusted.yaml +++ b/manifests/04-ca-trusted.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: ConfigMap metadata: annotations: + capability.openshift.io/name: ImageRegistry include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" release.openshift.io/create-only: "true" diff --git a/manifests/05-ca-rbac.yaml b/manifests/05-ca-rbac.yaml index 00a2c8767..76e9c22d6 100644 --- a/manifests/05-ca-rbac.yaml +++ b/manifests/05-ca-rbac.yaml @@ -5,6 +5,7 @@ metadata: name: node-ca namespace: openshift-image-registry annotations: + capability.openshift.io/name: ImageRegistry 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" @@ -24,6 +25,7 @@ metadata: name: node-ca namespace: openshift-image-registry annotations: + capability.openshift.io/name: ImageRegistry 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" diff --git a/manifests/06-ca-serviceaccount.yaml b/manifests/06-ca-serviceaccount.yaml index 75374c26f..a2e0047bd 100644 --- a/manifests/06-ca-serviceaccount.yaml +++ b/manifests/06-ca-serviceaccount.yaml @@ -5,6 +5,7 @@ metadata: name: node-ca namespace: openshift-image-registry annotations: + capability.openshift.io/name: ImageRegistry 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" diff --git a/manifests/07-operator-ibm-cloud-managed.yaml b/manifests/07-operator-ibm-cloud-managed.yaml index 0efb77ee1..43d792aea 100644 --- a/manifests/07-operator-ibm-cloud-managed.yaml +++ b/manifests/07-operator-ibm-cloud-managed.yaml @@ -3,6 +3,7 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: + capability.openshift.io/name: ImageRegistry config.openshift.io/inject-proxy: cluster-image-registry-operator include.release.openshift.io/ibm-cloud-managed: "true" name: cluster-image-registry-operator diff --git a/manifests/07-operator-service.yaml b/manifests/07-operator-service.yaml index e2a28608c..f8a697364 100644 --- a/manifests/07-operator-service.yaml +++ b/manifests/07-operator-service.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: Service metadata: annotations: + capability.openshift.io/name: ImageRegistry include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" service.alpha.openshift.io/serving-cert-secret-name: image-registry-operator-tls diff --git a/manifests/07-operator.yaml b/manifests/07-operator.yaml index eb90581ab..a7cd4988d 100644 --- a/manifests/07-operator.yaml +++ b/manifests/07-operator.yaml @@ -5,6 +5,7 @@ metadata: name: cluster-image-registry-operator namespace: openshift-image-registry annotations: + capability.openshift.io/name: ImageRegistry config.openshift.io/inject-proxy: cluster-image-registry-operator include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" diff --git a/manifests/08-clusteroperator.yaml b/manifests/08-clusteroperator.yaml index ac2c54e33..991358d1f 100644 --- a/manifests/08-clusteroperator.yaml +++ b/manifests/08-clusteroperator.yaml @@ -3,6 +3,7 @@ kind: ClusterOperator metadata: name: image-registry annotations: + capability.openshift.io/name: ImageRegistry 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" diff --git a/manifests/09-prometheus-rules-imagestreams.yaml b/manifests/09-prometheus-rules-imagestreams.yaml index 501a95af2..55c5cb8bd 100644 --- a/manifests/09-prometheus-rules-imagestreams.yaml +++ b/manifests/09-prometheus-rules-imagestreams.yaml @@ -4,6 +4,7 @@ metadata: name: imagestreams-rules namespace: openshift-image-registry annotations: + capability.openshift.io/name: ImageRegistry 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" diff --git a/manifests/09-prometheus-rules-registry-operations.yaml b/manifests/09-prometheus-rules-registry-operations.yaml index 76d03af6b..949469a29 100644 --- a/manifests/09-prometheus-rules-registry-operations.yaml +++ b/manifests/09-prometheus-rules-registry-operations.yaml @@ -4,6 +4,7 @@ metadata: name: image-registry-rules namespace: openshift-image-registry annotations: + capability.openshift.io/name: ImageRegistry 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" diff --git a/manifests/09-prometheus-rules.yaml b/manifests/09-prometheus-rules.yaml index 2e2f2c8c5..c8a746e70 100644 --- a/manifests/09-prometheus-rules.yaml +++ b/manifests/09-prometheus-rules.yaml @@ -4,6 +4,7 @@ metadata: name: image-registry-operator-alerts namespace: openshift-image-registry annotations: + capability.openshift.io/name: ImageRegistry release.openshift.io/delete: "true" include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" diff --git a/manifests/image-references b/manifests/image-references index cf4065c8f..17644ebe0 100644 --- a/manifests/image-references +++ b/manifests/image-references @@ -1,5 +1,8 @@ kind: ImageStream apiVersion: image.openshift.io/v1 +metadata: + annotations: + capability.openshift.io/name: ImageRegistry spec: tags: - name: cluster-image-registry-operator