Merge pull request #249 from honza/baremetal-capability

Add baremetal capability annotations
openshift · Mar 25, 2022 · efa06ca · efa06ca
2 parents d54b0bb + 8f43aca
commit efa06ca
Show file tree

Hide file tree

Showing 22 changed files with 29 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -2,11 +2,12 @@ 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"
     release.openshift.io/create-only: "true"
   labels:
     config.openshift.io/inject-trusted-cabundle: "true"
   name: cbo-trusted-ca
-  namespace: openshift-machine-api
+  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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -295,6 +297,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
@@ -312,6 +315,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
@@ -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
@@ -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
@@ -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