diff --git a/config/cluster-baremetal-operator/kustomization.yaml b/config/cluster-baremetal-operator/kustomization.yaml index d26d1bdec..8cda2c9dd 100644 --- a/config/cluster-baremetal-operator/kustomization.yaml +++ b/config/cluster-baremetal-operator/kustomization.yaml @@ -1,6 +1,7 @@ commonAnnotations: include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" + capability.openshift.io/name: baremetal resources: - cluster-baremetal-operator.yaml diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml index 250045916..1a455d1a4 100644 --- a/config/crd/kustomization.yaml +++ b/config/crd/kustomization.yaml @@ -1,6 +1,7 @@ commonAnnotations: include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" + capability.openshift.io/name: baremetal # This kustomization.yaml is not intended to be run by itself, # since it depends on service name and namespace that are out of this kustomize package. diff --git a/config/prometheus/monitor.yaml b/config/prometheus/monitor.yaml index 12ca154d1..59b75f9c9 100644 --- a/config/prometheus/monitor.yaml +++ b/config/prometheus/monitor.yaml @@ -4,6 +4,7 @@ kind: ServiceMonitor metadata: annotations: exclude.release.openshift.io/internal-openshift-hosted: "true" + capability.openshift.io/name: baremetal labels: k8s-app: cluster-baremetal-operator name: cluster-baremetal-operator-servicemonitor diff --git a/config/prometheus/proxyconfig.yaml b/config/prometheus/proxyconfig.yaml index b8439d2ab..222fa3c12 100644 --- a/config/prometheus/proxyconfig.yaml +++ b/config/prometheus/proxyconfig.yaml @@ -5,6 +5,7 @@ metadata: namespace: openshift-machine-api annotations: include.release.openshift.io/self-managed-high-availability: "true" + capability.openshift.io/name: baremetal data: config-file.yaml: |+ authorization: diff --git a/config/prometheus/rbac.yaml b/config/prometheus/rbac.yaml index 62f3a3fd2..a0b0c6e0b 100644 --- a/config/prometheus/rbac.yaml +++ b/config/prometheus/rbac.yaml @@ -5,6 +5,7 @@ metadata: namespace: openshift-machine-api annotations: include.release.openshift.io/self-managed-high-availability: "true" + capability.openshift.io/name: baremetal roleRef: apiGroup: rbac.authorization.k8s.io kind: Role @@ -23,6 +24,7 @@ metadata: namespace: openshift-machine-api annotations: include.release.openshift.io/self-managed-high-availability: "true" + capability.openshift.io/name: baremetal rules: - apiGroups: - "" diff --git a/config/prometheus/service.yaml b/config/prometheus/service.yaml index d09b42832..fb68082c1 100644 --- a/config/prometheus/service.yaml +++ b/config/prometheus/service.yaml @@ -8,6 +8,7 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" service.alpha.openshift.io/serving-cert-secret-name: cluster-baremetal-operator-tls + capability.openshift.io/name: baremetal labels: k8s-app: cluster-baremetal-operator spec: diff --git a/config/rbac/kustomization.yaml b/config/rbac/kustomization.yaml index 1dce014a6..fc61f8cf9 100644 --- a/config/rbac/kustomization.yaml +++ b/config/rbac/kustomization.yaml @@ -1,6 +1,7 @@ commonAnnotations: include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" + capability.openshift.io/name: baremetal resources: - role.yaml diff --git a/config/webhook/kustomization.yaml b/config/webhook/kustomization.yaml index 3544c2179..d5594bb9a 100644 --- a/config/webhook/kustomization.yaml +++ b/config/webhook/kustomization.yaml @@ -1,6 +1,7 @@ commonAnnotations: include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" + capability.openshift.io/name: baremetal resources: - service.yaml diff --git a/controllers/bindata.go b/controllers/bindata.go index 954cfceb8..e78126cd3 100644 --- a/controllers/bindata.go +++ b/controllers/bindata.go @@ -77,7 +77,7 @@ func (fi bindataFileInfo) Sys() interface{} { return nil } -var _Manifests0000_31_clusterBaremetalOperator_07_clusteroperatorCrYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x94\x90\xb1\x6e\xeb\x30\x0c\x45\x77\x7d\x85\xe0\x5d\x7e\xc9\xaa\xf5\x7d\x40\xb7\xee\x4c\x74\x63\x13\x95\x49\x41\xa4\x8d\x16\x45\xff\xbd\xb0\xdb\x04\xe8\x52\xa0\x1b\x71\x41\x9e\x0b\x1e\x6a\xfc\x8c\x6e\xac\x92\xe3\x55\xe5\xc6\xd3\xa8\x0d\x62\x33\xdf\x7c\x64\xfd\xb7\x9d\xc3\x0b\x4b\xc9\xf1\x7f\x5d\xcd\xd1\x9f\x1a\x3a\xb9\xf6\xb0\xc0\xa9\x90\x53\x0e\x31\x0a\x2d\xc8\xf1\x42\x1d\x7b\x5a\x43\x8c\x24\xa2\x4e\xce\x2a\xb6\x2f\xc4\x88\xd7\x6b\x5d\x0b\xc6\x8e\x0a\x32\xfc\x2c\x61\x71\x74\xa1\x9a\x1e\x69\x9a\xd5\x1c\x25\xc7\xc1\xfb\x8a\xe1\x40\xb0\xfc\x82\x30\xd4\x5b\x5a\x48\x68\x42\x49\x33\x4f\x73\xa2\x8d\xb8\xd2\x85\x2b\xfb\xdb\x1f\x38\x2c\x53\x45\x12\x2d\x48\x05\x1b\xaa\x36\xf4\xc7\xb9\x35\x5c\x73\x7c\xff\x08\xe6\xe4\xeb\xf1\xda\xf6\x65\xef\x98\xd3\xb7\x09\xbd\x4b\xda\xeb\xb6\xbb\xde\xe1\x34\x9e\xc6\x73\x32\xa1\x66\xb3\xfa\x10\x3e\x03\x00\x00\xff\xff\x16\x63\xf4\x78\x7c\x01\x00\x00") +var _Manifests0000_31_clusterBaremetalOperator_07_clusteroperatorCrYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x94\x91\x41\x6a\x03\x31\x0c\x45\xf7\x3e\x85\x98\xbd\xa7\xc9\xd6\xdb\x1e\xa0\xbb\xee\x95\xf1\xcf\x8c\xa8\x23\x19\x5b\x33\xb4\x94\xde\xbd\x24\x4d\x02\xa1\x50\xe8\xce\x7c\xfc\x9f\xc4\x13\x57\x79\x45\xeb\x62\x9a\x68\x32\x3d\xca\x3c\x5a\x85\xf6\x45\x8e\x3e\x8a\x3d\x6d\xfb\xf0\x26\x9a\x13\x3d\x97\xb5\x3b\xda\x4b\x45\x63\xb7\x16\x4e\x70\xce\xec\x9c\x02\x91\xf2\x09\x89\x0e\xdc\x70\x4e\x4b\x20\x62\x55\x73\x76\x31\xed\xe7\x0f\x44\x13\x57\x3e\x48\x11\xff\x78\xe4\xff\xae\x12\xe1\x7d\x2a\x6b\xc6\xd8\x50\xc0\x1d\x8f\x05\x51\x47\x53\x2e\xf1\x9e\xc6\xc5\xba\x23\x27\x1a\xbc\xad\x18\x2e\x08\xd1\x3f\x10\x1d\xe5\x18\x4f\xac\x3c\x23\xc7\x45\xe6\x25\xf2\xc6\x52\xae\xfb\xfd\x83\x23\x3a\x17\x44\xb5\x8c\x98\xb1\xa1\x58\x45\xbb\xd7\x7b\xc5\x94\xe8\xf3\x2b\x74\x67\x5f\x2f\x1a\xb6\x1f\xd3\x97\x77\xbc\x5a\xb3\x9b\xd0\xf3\xb8\xed\x76\x8a\x61\x37\xee\xc6\x7d\xec\xca\xb5\x2f\xe6\x43\xf8\x0e\x00\x00\xff\xff\x79\x9c\x81\x80\xa8\x01\x00\x00") func Manifests0000_31_clusterBaremetalOperator_07_clusteroperatorCrYamlBytes() ([]byte, error) { return bindataRead( diff --git a/controllers/clusteroperator_test.go b/controllers/clusteroperator_test.go index e54fb7486..250cb4f29 100644 --- a/controllers/clusteroperator_test.go +++ b/controllers/clusteroperator_test.go @@ -152,6 +152,7 @@ func TestEnsureClusterOperator(t *testing.T) { ObjectMeta: metav1.ObjectMeta{ Name: clusterOperatorName, Annotations: map[string]string{ + "capability.openshift.io/name": "baremetal", "exclude.release.openshift.io/internal-openshift-hosted": "true", "include.release.openshift.io/self-managed-high-availability": "true", "include.release.openshift.io/single-node-developer": "true", diff --git a/manifests/0000_31_cluster-baremetal-operator_01_images.configmap.yaml b/manifests/0000_31_cluster-baremetal-operator_01_images.configmap.yaml index 0cdebe5d6..873b6d132 100644 --- a/manifests/0000_31_cluster-baremetal-operator_01_images.configmap.yaml +++ b/manifests/0000_31_cluster-baremetal-operator_01_images.configmap.yaml @@ -5,6 +5,7 @@ metadata: name: cluster-baremetal-operator-images namespace: openshift-machine-api annotations: + capability.openshift.io/name: baremetal include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" data: diff --git a/manifests/0000_31_cluster-baremetal-operator_01_trusted-ca-configmap.yaml b/manifests/0000_31_cluster-baremetal-operator_01_trusted-ca-configmap.yaml index fd10e3a03..0ba9be972 100644 --- a/manifests/0000_31_cluster-baremetal-operator_01_trusted-ca-configmap.yaml +++ b/manifests/0000_31_cluster-baremetal-operator_01_trusted-ca-configmap.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: ConfigMap metadata: annotations: + capability.openshift.io/name: baremetal 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" @@ -9,4 +10,4 @@ metadata: labels: config.openshift.io/inject-trusted-cabundle: "true" name: cbo-trusted-ca - namespace: openshift-machine-api \ No newline at end of file + namespace: openshift-machine-api diff --git a/manifests/0000_31_cluster-baremetal-operator_02_metal3provisioning.crd.yaml b/manifests/0000_31_cluster-baremetal-operator_02_metal3provisioning.crd.yaml index 538b586b3..f47c1bd5f 100644 --- a/manifests/0000_31_cluster-baremetal-operator_02_metal3provisioning.crd.yaml +++ b/manifests/0000_31_cluster-baremetal-operator_02_metal3provisioning.crd.yaml @@ -2,6 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: + capability.openshift.io/name: baremetal include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" creationTimestamp: null diff --git a/manifests/0000_31_cluster-baremetal-operator_03_service.yaml b/manifests/0000_31_cluster-baremetal-operator_03_service.yaml index ef99083b0..28f190740 100644 --- a/manifests/0000_31_cluster-baremetal-operator_03_service.yaml +++ b/manifests/0000_31_cluster-baremetal-operator_03_service.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: Service metadata: annotations: + capability.openshift.io/name: baremetal exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" service.alpha.openshift.io/serving-cert-secret-name: cluster-baremetal-operator-tls diff --git a/manifests/0000_31_cluster-baremetal-operator_03_webhookservice.yaml b/manifests/0000_31_cluster-baremetal-operator_03_webhookservice.yaml index 1614b035c..1a18734d1 100644 --- a/manifests/0000_31_cluster-baremetal-operator_03_webhookservice.yaml +++ b/manifests/0000_31_cluster-baremetal-operator_03_webhookservice.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: Service metadata: annotations: + capability.openshift.io/name: baremetal include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" service.beta.openshift.io/serving-cert-secret-name: cluster-baremetal-webhook-server-cert diff --git a/manifests/0000_31_cluster-baremetal-operator_04_serviceaccount.yaml b/manifests/0000_31_cluster-baremetal-operator_04_serviceaccount.yaml index d9fcf974b..7e85fc672 100644 --- a/manifests/0000_31_cluster-baremetal-operator_04_serviceaccount.yaml +++ b/manifests/0000_31_cluster-baremetal-operator_04_serviceaccount.yaml @@ -4,6 +4,7 @@ metadata: name: cluster-baremetal-operator namespace: openshift-machine-api annotations: + capability.openshift.io/name: baremetal exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" diff --git a/manifests/0000_31_cluster-baremetal-operator_05_kube-rbac-proxy-config.yaml b/manifests/0000_31_cluster-baremetal-operator_05_kube-rbac-proxy-config.yaml index 310350b12..0ae47592a 100644 --- a/manifests/0000_31_cluster-baremetal-operator_05_kube-rbac-proxy-config.yaml +++ b/manifests/0000_31_cluster-baremetal-operator_05_kube-rbac-proxy-config.yaml @@ -11,6 +11,7 @@ data: kind: ConfigMap metadata: annotations: + capability.openshift.io/name: baremetal include.release.openshift.io/self-managed-high-availability: "true" name: kube-rbac-proxy namespace: openshift-machine-api diff --git a/manifests/0000_31_cluster-baremetal-operator_05_prometheus_rbac.yaml b/manifests/0000_31_cluster-baremetal-operator_05_prometheus_rbac.yaml index f6f07b704..d492b4940 100644 --- a/manifests/0000_31_cluster-baremetal-operator_05_prometheus_rbac.yaml +++ b/manifests/0000_31_cluster-baremetal-operator_05_prometheus_rbac.yaml @@ -2,6 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: annotations: + capability.openshift.io/name: baremetal include.release.openshift.io/self-managed-high-availability: "true" name: prometheus-k8s-cluster-baremetal-operator namespace: openshift-machine-api @@ -18,6 +19,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: annotations: + capability.openshift.io/name: baremetal include.release.openshift.io/self-managed-high-availability: "true" name: prometheus-k8s-cluster-baremetal-operator namespace: openshift-machine-api diff --git a/manifests/0000_31_cluster-baremetal-operator_05_rbac.yaml b/manifests/0000_31_cluster-baremetal-operator_05_rbac.yaml index 6ec8b8e6e..208c6b34e 100644 --- a/manifests/0000_31_cluster-baremetal-operator_05_rbac.yaml +++ b/manifests/0000_31_cluster-baremetal-operator_05_rbac.yaml @@ -2,6 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: annotations: + capability.openshift.io/name: baremetal include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" creationTimestamp: null @@ -64,6 +65,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: annotations: + capability.openshift.io/name: baremetal include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" creationTimestamp: null @@ -280,6 +282,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: annotations: + capability.openshift.io/name: baremetal include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" name: cluster-baremetal-operator @@ -297,6 +300,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: annotations: + capability.openshift.io/name: baremetal include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" name: cluster-baremetal-operator diff --git a/manifests/0000_31_cluster-baremetal-operator_06_deployment.yaml b/manifests/0000_31_cluster-baremetal-operator_06_deployment.yaml index 41d5ac0f8..ff604cd79 100644 --- a/manifests/0000_31_cluster-baremetal-operator_06_deployment.yaml +++ b/manifests/0000_31_cluster-baremetal-operator_06_deployment.yaml @@ -2,6 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: + capability.openshift.io/name: baremetal exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" @@ -17,6 +18,7 @@ spec: template: metadata: annotations: + capability.openshift.io/name: baremetal include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}' diff --git a/manifests/0000_31_cluster-baremetal-operator_07_clusteroperator.cr.yaml b/manifests/0000_31_cluster-baremetal-operator_07_clusteroperator.cr.yaml index 5474a22b9..c87ce746c 100644 --- a/manifests/0000_31_cluster-baremetal-operator_07_clusteroperator.cr.yaml +++ b/manifests/0000_31_cluster-baremetal-operator_07_clusteroperator.cr.yaml @@ -3,6 +3,7 @@ kind: ClusterOperator metadata: name: baremetal annotations: + capability.openshift.io/name: baremetal exclude.release.openshift.io/internal-openshift-hosted: "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-baremetal-operator_03_servicemonitor.yaml b/manifests/0000_90_cluster-baremetal-operator_03_servicemonitor.yaml index d471a23b7..3a3f2ceee 100644 --- a/manifests/0000_90_cluster-baremetal-operator_03_servicemonitor.yaml +++ b/manifests/0000_90_cluster-baremetal-operator_03_servicemonitor.yaml @@ -2,6 +2,7 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: annotations: + capability.openshift.io/name: baremetal exclude.release.openshift.io/internal-openshift-hosted: "true" labels: k8s-app: cluster-baremetal-operator