Merge pull request #565 from eggfoobar/add-capability-annotation

OCPVE-674: feat: add annotations for capabilities feature

Author: openshift-ci[bot]

manifests/0000_50_olm_00-catalogsources.crd.yaml

@@ -5,6 +5,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.8.0
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
+    capability.openshift.io/name: "OperatorLifecycleManager"
   creationTimestamp: null
   name: catalogsources.operators.coreos.com
 spec:

manifests/0000_50_olm_00-clusterserviceversions.crd.yaml

@@ -5,6 +5,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.8.0
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
+    capability.openshift.io/name: "OperatorLifecycleManager"
   creationTimestamp: null
   name: clusterserviceversions.operators.coreos.com
 spec:

manifests/0000_50_olm_00-installplans.crd.yaml

@@ -5,6 +5,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.8.0
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
+    capability.openshift.io/name: "OperatorLifecycleManager"
   creationTimestamp: null
   name: installplans.operators.coreos.com
 spec:

manifests/0000_50_olm_00-namespace.yaml

@@ -12,6 +12,7 @@ metadata:
     workload.openshift.io/allowed: "management"
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
+    capability.openshift.io/name: "OperatorLifecycleManager"
 ---
 apiVersion: v1
 kind: Namespace
@@ -26,3 +27,4 @@ metadata:
     workload.openshift.io/allowed: "management"
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
+    capability.openshift.io/name: "OperatorLifecycleManager"

manifests/0000_50_olm_00-olmconfigs.crd.yaml

@@ -5,6 +5,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.8.0
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
+    capability.openshift.io/name: "OperatorLifecycleManager"
   creationTimestamp: null
   name: olmconfigs.operators.coreos.com
 spec:

manifests/0000_50_olm_00-operatorconditions.crd.yaml

@@ -5,6 +5,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.8.0
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
+    capability.openshift.io/name: "OperatorLifecycleManager"
   creationTimestamp: null
   name: operatorconditions.operators.coreos.com
 spec:

manifests/0000_50_olm_00-operatorgroups.crd.yaml

@@ -5,6 +5,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.8.0
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
+    capability.openshift.io/name: "OperatorLifecycleManager"
   creationTimestamp: null
   name: operatorgroups.operators.coreos.com
 spec:

manifests/0000_50_olm_00-operators.crd.yaml

@@ -5,6 +5,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.8.0
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
+    capability.openshift.io/name: "OperatorLifecycleManager"
   creationTimestamp: null
   name: operators.operators.coreos.com
 spec:

manifests/0000_50_olm_00-packageserver.pdb.yaml

@@ -6,6 +6,7 @@ metadata:
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
+    capability.openshift.io/name: "OperatorLifecycleManager"
 spec:
   maxUnavailable: 1
   selector:

manifests/0000_50_olm_00-pprof-config.yaml

@@ -5,6 +5,7 @@ metadata:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     release.openshift.io/create-only: "true"
+    capability.openshift.io/name: "OperatorLifecycleManager"
   name: collect-profiles-config
   namespace: openshift-operator-lifecycle-manager
 data:

manifests/0000_50_olm_00-pprof-rbac.yaml

@@ -4,6 +4,7 @@ metadata:
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
+    capability.openshift.io/name: "OperatorLifecycleManager"
   name: collect-profiles
   namespace: openshift-operator-lifecycle-manager
 rules:
@@ -20,6 +21,7 @@ metadata:
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
+    capability.openshift.io/name: "OperatorLifecycleManager"
   name: collect-profiles
   namespace: openshift-operator-lifecycle-manager
 subjects:
@@ -37,5 +39,6 @@ metadata:
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
+    capability.openshift.io/name: "OperatorLifecycleManager"
   name: collect-profiles
   namespace: openshift-operator-lifecycle-manager

manifests/0000_50_olm_00-pprof-secret.yaml

@@ -5,6 +5,7 @@ metadata:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     release.openshift.io/create-only: "true"
+    capability.openshift.io/name: "OperatorLifecycleManager"
   name: pprof-cert
   namespace: openshift-operator-lifecycle-manager
 type: kubernetes.io/tls

manifests/0000_50_olm_00-subscriptions.crd.yaml

@@ -5,6 +5,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.8.0
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
+    capability.openshift.io/name: "OperatorLifecycleManager"
   creationTimestamp: null
   name: subscriptions.operators.coreos.com
 spec:

manifests/0000_50_olm_01-olm-operator.serviceaccount.yaml

@@ -6,6 +6,7 @@ metadata:
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
+    capability.openshift.io/name: "OperatorLifecycleManager"
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
@@ -14,6 +15,7 @@ metadata:
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
+    capability.openshift.io/name: "OperatorLifecycleManager"
 rules:
   - apiGroups: ["*"]
     resources: ["*"]
@@ -28,6 +30,7 @@ metadata:
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
+    capability.openshift.io/name: "OperatorLifecycleManager"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole

manifests/0000_50_olm_02-olmconfig.yaml

@@ -6,3 +6,4 @@ metadata:
     release.openshift.io/create-only: "true"
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
+    capability.openshift.io/name: "OperatorLifecycleManager"

manifests/0000_50_olm_02-services.yaml

@@ -7,6 +7,7 @@ metadata:
     service.alpha.openshift.io/serving-cert-secret-name: olm-operator-serving-cert
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
+    capability.openshift.io/name: "OperatorLifecycleManager"
   labels:
     app: olm-operator
 spec:
@@ -28,6 +29,7 @@ metadata:
     service.alpha.openshift.io/serving-cert-secret-name: catalog-operator-serving-cert
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
+    capability.openshift.io/name: "OperatorLifecycleManager"
   labels:
     app: catalog-operator
 spec:

manifests/0000_50_olm_06-psm-operator.deployment.ibm-cloud-managed.yaml

@@ -7,6 +7,7 @@ metadata:
     app: package-server-manager
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
+    capability.openshift.io/name: "OperatorLifecycleManager"
 spec:
   strategy:
     type: RollingUpdate

manifests/0000_50_olm_06-psm-operator.deployment.yaml

@@ -7,6 +7,7 @@ metadata:
     app: package-server-manager
   annotations:
     include.release.openshift.io/self-managed-high-availability: "true"
+    capability.openshift.io/name: "OperatorLifecycleManager"
 spec:
   strategy:
     type: RollingUpdate

manifests/0000_50_olm_06-psm-operator.service.yaml

@@ -5,6 +5,7 @@ metadata:
     include.release.openshift.io/self-managed-high-availability: "true"
     service.alpha.openshift.io/serving-cert-secret-name: package-server-manager-serving-cert
     include.release.openshift.io/ibm-cloud-managed: "true"
+    capability.openshift.io/name: "OperatorLifecycleManager"
   name: package-server-manager-metrics
   namespace: openshift-operator-lifecycle-manager
 spec:

manifests/0000_50_olm_06-psm-operator.servicemonitor.yaml

@@ -6,6 +6,7 @@ metadata:
   annotations:
     include.release.openshift.io/self-managed-high-availability: "true"
     include.release.openshift.io/ibm-cloud-managed: "true"
+    capability.openshift.io/name: "OperatorLifecycleManager"
 spec:
   endpoints:
     - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token

manifests/0000_50_olm_07-collect-profiles.cronjob.yaml

@@ -4,6 +4,7 @@ metadata:
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
+    capability.openshift.io/name: "OperatorLifecycleManager"
   name: collect-profiles
   namespace: openshift-operator-lifecycle-manager
 spec:

manifests/0000_50_olm_07-olm-operator.deployment.ibm-cloud-managed.yaml

@@ -7,6 +7,7 @@ metadata:
     app: olm-operator
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
+    capability.openshift.io/name: "OperatorLifecycleManager"
 spec:
   strategy:
     type: RollingUpdate

manifests/0000_50_olm_07-olm-operator.deployment.yaml

@@ -7,6 +7,7 @@ metadata:
     app: olm-operator
   annotations:
     include.release.openshift.io/self-managed-high-availability: "true"
+    capability.openshift.io/name: "OperatorLifecycleManager"
 spec:
   strategy:
     type: RollingUpdate

manifests/0000_50_olm_08-catalog-operator.deployment.ibm-cloud-managed.yaml

@@ -7,6 +7,7 @@ metadata:
     app: catalog-operator
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
+    capability.openshift.io/name: "OperatorLifecycleManager"
 spec:
   strategy:
     type: RollingUpdate

manifests/0000_50_olm_08-catalog-operator.deployment.yaml

@@ -7,6 +7,7 @@ metadata:
     app: catalog-operator
   annotations:
     include.release.openshift.io/self-managed-high-availability: "true"
+    capability.openshift.io/name: "OperatorLifecycleManager"
 spec:
   strategy:
     type: RollingUpdate

manifests/0000_50_olm_09-aggregated.clusterrole.yaml

@@ -9,6 +9,7 @@ metadata:
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
+    capability.openshift.io/name: "OperatorLifecycleManager"
 rules:
   - apiGroups: ["operators.coreos.com"]
     resources: ["subscriptions"]
@@ -29,6 +30,7 @@ metadata:
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
+    capability.openshift.io/name: "OperatorLifecycleManager"
 rules:
   - apiGroups: ["operators.coreos.com"]
     resources: ["clusterserviceversions", "catalogsources", "installplans", "subscriptions", "operatorgroups"]

manifests/0000_50_olm_11-olm-operators.configmap.removed.yaml

@@ -7,3 +7,4 @@ metadata:
     release.openshift.io/delete: "true"
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
+    capability.openshift.io/name: "OperatorLifecycleManager"

manifests/0000_50_olm_12-olm-operators.catalogsource.removed.yaml

@@ -7,3 +7,4 @@ metadata:
     release.openshift.io/delete: "true"
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
+    capability.openshift.io/name: "OperatorLifecycleManager"

manifests/0000_50_olm_13-operatorgroup-default.yaml

@@ -6,6 +6,7 @@ metadata:
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
+    capability.openshift.io/name: "OperatorLifecycleManager"
 ---
 apiVersion: operators.coreos.com/v1
 kind: OperatorGroup
@@ -15,6 +16,7 @@ metadata:
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
+    capability.openshift.io/name: "OperatorLifecycleManager"
 spec:
   targetNamespaces:
     - openshift-operator-lifecycle-manager

manifests/0000_50_olm_14-packageserver.subscription.removed.yaml

@@ -7,3 +7,4 @@ metadata:
     release.openshift.io/delete: "true"
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
+    capability.openshift.io/name: "OperatorLifecycleManager"

manifests/0000_50_olm_15-csv-viewer.rbac.yaml

@@ -5,6 +5,7 @@ metadata:
     rbac.authorization.kubernetes.io/autoupdate: "true"
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
+    capability.openshift.io/name: "OperatorLifecycleManager"
   name: copied-csv-viewer
   namespace: openshift
 rules:
@@ -24,6 +25,7 @@ metadata:
     rbac.authorization.kubernetes.io/autoupdate: "true"
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
+    capability.openshift.io/name: "OperatorLifecycleManager"
   name: copied-csv-viewers
   namespace: openshift
 roleRef:

manifests/0000_50_olm_99-operatorstatus.yaml

@@ -5,6 +5,7 @@ metadata:
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
+    capability.openshift.io/name: "OperatorLifecycleManager"
 status:
   versions:
     - name: operator
@@ -17,6 +18,7 @@ metadata:
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
+    capability.openshift.io/name: "OperatorLifecycleManager"
 status:
   versions:
     - name: operator
@@ -29,6 +31,7 @@ metadata:
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
+    capability.openshift.io/name: "OperatorLifecycleManager"
 status:
   versions:
     - name: operator

manifests/0000_90_olm_00-service-monitor.yaml

@@ -6,6 +6,7 @@ metadata:
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
+    capability.openshift.io/name: "OperatorLifecycleManager"
 rules:
   - apiGroups:
       - ""
@@ -26,6 +27,7 @@ metadata:
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
+    capability.openshift.io/name: "OperatorLifecycleManager"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
@@ -45,6 +47,7 @@ metadata:
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
+    capability.openshift.io/name: "OperatorLifecycleManager"
 spec:
   endpoints:
     - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
@@ -77,6 +80,7 @@ metadata:
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
+    capability.openshift.io/name: "OperatorLifecycleManager"
 spec:
   endpoints:
     - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token

manifests/0000_90_olm_01-prometheus-rule.yaml

@@ -9,6 +9,7 @@ metadata:
   annotations:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
+    capability.openshift.io/name: "OperatorLifecycleManager"
 spec:
   groups:
     - name: olm.csv_abnormal.rules

scripts/generate_crds_manifests.sh

@@ -78,9 +78,11 @@ add_ibm_managed_cloud_annotations() {
          g="${f/%.yaml/.ibm-cloud-managed.yaml}"
          cp "${f}" "${g}"
          ${YQ} w -d'*' --inplace --style=double "$g" 'metadata.annotations['include.release.openshift.io/ibm-cloud-managed']' true
+         ${YQ} w -d'*' --inplace --style=double "$g" 'metadata.annotations['capability.openshift.io/name']' OperatorLifecycleManager
          ${YQ} d -d'*' --inplace "$g" 'spec.template.spec.nodeSelector."node-role.kubernetes.io/master"'
       fi
       ${YQ} w -d'*' --inplace --style=double "$f" 'metadata.annotations['include.release.openshift.io/self-managed-high-availability']' true
+      ${YQ} w -d'*' --inplace --style=double "$f" 'metadata.annotations['capability.openshift.io/name']' OperatorLifecycleManager
    done
 }