diff --git a/manifests/0000_50_olm_00-catalogsources.crd.yaml b/manifests/0000_50_olm_00-catalogsources.crd.yaml index 618d0972f9..84032748ed 100644 --- a/manifests/0000_50_olm_00-catalogsources.crd.yaml +++ b/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: diff --git a/manifests/0000_50_olm_00-clusterserviceversions.crd.yaml b/manifests/0000_50_olm_00-clusterserviceversions.crd.yaml index 078947711d..00b8283f01 100644 --- a/manifests/0000_50_olm_00-clusterserviceversions.crd.yaml +++ b/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: diff --git a/manifests/0000_50_olm_00-installplans.crd.yaml b/manifests/0000_50_olm_00-installplans.crd.yaml index 34e5c391d7..dbf2a6e1d0 100644 --- a/manifests/0000_50_olm_00-installplans.crd.yaml +++ b/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: diff --git a/manifests/0000_50_olm_00-namespace.yaml b/manifests/0000_50_olm_00-namespace.yaml index ec165daa34..834789112c 100644 --- a/manifests/0000_50_olm_00-namespace.yaml +++ b/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" diff --git a/manifests/0000_50_olm_00-olmconfigs.crd.yaml b/manifests/0000_50_olm_00-olmconfigs.crd.yaml index a7fd44cb35..503dc9b621 100644 --- a/manifests/0000_50_olm_00-olmconfigs.crd.yaml +++ b/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: diff --git a/manifests/0000_50_olm_00-operatorconditions.crd.yaml b/manifests/0000_50_olm_00-operatorconditions.crd.yaml index 443c08b5b2..bb67de23dd 100644 --- a/manifests/0000_50_olm_00-operatorconditions.crd.yaml +++ b/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: diff --git a/manifests/0000_50_olm_00-operatorgroups.crd.yaml b/manifests/0000_50_olm_00-operatorgroups.crd.yaml index b0b7d46cdc..207edfd0c3 100644 --- a/manifests/0000_50_olm_00-operatorgroups.crd.yaml +++ b/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: diff --git a/manifests/0000_50_olm_00-operators.crd.yaml b/manifests/0000_50_olm_00-operators.crd.yaml index 1b62806c08..0b6f1be930 100644 --- a/manifests/0000_50_olm_00-operators.crd.yaml +++ b/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: diff --git a/manifests/0000_50_olm_00-packageserver.pdb.yaml b/manifests/0000_50_olm_00-packageserver.pdb.yaml index 48918a7ac9..4e024a46ae 100644 --- a/manifests/0000_50_olm_00-packageserver.pdb.yaml +++ b/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: diff --git a/manifests/0000_50_olm_00-pprof-config.yaml b/manifests/0000_50_olm_00-pprof-config.yaml index 0b728f9f58..b8efec8f63 100644 --- a/manifests/0000_50_olm_00-pprof-config.yaml +++ b/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: diff --git a/manifests/0000_50_olm_00-pprof-rbac.yaml b/manifests/0000_50_olm_00-pprof-rbac.yaml index df1cb9b187..f4c107070f 100644 --- a/manifests/0000_50_olm_00-pprof-rbac.yaml +++ b/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 diff --git a/manifests/0000_50_olm_00-pprof-secret.yaml b/manifests/0000_50_olm_00-pprof-secret.yaml index eebecd82b6..d77a5c076c 100644 --- a/manifests/0000_50_olm_00-pprof-secret.yaml +++ b/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 diff --git a/manifests/0000_50_olm_00-subscriptions.crd.yaml b/manifests/0000_50_olm_00-subscriptions.crd.yaml index 6b51d9fa19..2f8c43d3f9 100644 --- a/manifests/0000_50_olm_00-subscriptions.crd.yaml +++ b/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: diff --git a/manifests/0000_50_olm_01-olm-operator.serviceaccount.yaml b/manifests/0000_50_olm_01-olm-operator.serviceaccount.yaml index 36726fc928..040a1d07d7 100644 --- a/manifests/0000_50_olm_01-olm-operator.serviceaccount.yaml +++ b/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 diff --git a/manifests/0000_50_olm_02-olmconfig.yaml b/manifests/0000_50_olm_02-olmconfig.yaml index 32eef2ecef..bdaad0ab86 100644 --- a/manifests/0000_50_olm_02-olmconfig.yaml +++ b/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" diff --git a/manifests/0000_50_olm_02-services.yaml b/manifests/0000_50_olm_02-services.yaml index 95cfebca85..44b47c111c 100644 --- a/manifests/0000_50_olm_02-services.yaml +++ b/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: diff --git a/manifests/0000_50_olm_06-psm-operator.deployment.ibm-cloud-managed.yaml b/manifests/0000_50_olm_06-psm-operator.deployment.ibm-cloud-managed.yaml index 696f91f35e..518a45058f 100644 --- a/manifests/0000_50_olm_06-psm-operator.deployment.ibm-cloud-managed.yaml +++ b/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 diff --git a/manifests/0000_50_olm_06-psm-operator.deployment.yaml b/manifests/0000_50_olm_06-psm-operator.deployment.yaml index 5065366b82..b67dce1fa7 100644 --- a/manifests/0000_50_olm_06-psm-operator.deployment.yaml +++ b/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 diff --git a/manifests/0000_50_olm_06-psm-operator.service.yaml b/manifests/0000_50_olm_06-psm-operator.service.yaml index e0a180a2df..90e2e3c101 100644 --- a/manifests/0000_50_olm_06-psm-operator.service.yaml +++ b/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: diff --git a/manifests/0000_50_olm_06-psm-operator.servicemonitor.yaml b/manifests/0000_50_olm_06-psm-operator.servicemonitor.yaml index 8fead98be1..87d6e18507 100644 --- a/manifests/0000_50_olm_06-psm-operator.servicemonitor.yaml +++ b/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 diff --git a/manifests/0000_50_olm_07-collect-profiles.cronjob.yaml b/manifests/0000_50_olm_07-collect-profiles.cronjob.yaml index e368167802..eaa2955d22 100644 --- a/manifests/0000_50_olm_07-collect-profiles.cronjob.yaml +++ b/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: diff --git a/manifests/0000_50_olm_07-olm-operator.deployment.ibm-cloud-managed.yaml b/manifests/0000_50_olm_07-olm-operator.deployment.ibm-cloud-managed.yaml index cde52e1b9b..5631a5ed8a 100644 --- a/manifests/0000_50_olm_07-olm-operator.deployment.ibm-cloud-managed.yaml +++ b/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 diff --git a/manifests/0000_50_olm_07-olm-operator.deployment.yaml b/manifests/0000_50_olm_07-olm-operator.deployment.yaml index aa91f97bda..211d0049d4 100644 --- a/manifests/0000_50_olm_07-olm-operator.deployment.yaml +++ b/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 diff --git a/manifests/0000_50_olm_08-catalog-operator.deployment.ibm-cloud-managed.yaml b/manifests/0000_50_olm_08-catalog-operator.deployment.ibm-cloud-managed.yaml index 1df4b9edd1..bbcdd2658c 100644 --- a/manifests/0000_50_olm_08-catalog-operator.deployment.ibm-cloud-managed.yaml +++ b/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 diff --git a/manifests/0000_50_olm_08-catalog-operator.deployment.yaml b/manifests/0000_50_olm_08-catalog-operator.deployment.yaml index 44ab309207..9d9cd5e457 100644 --- a/manifests/0000_50_olm_08-catalog-operator.deployment.yaml +++ b/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 diff --git a/manifests/0000_50_olm_09-aggregated.clusterrole.yaml b/manifests/0000_50_olm_09-aggregated.clusterrole.yaml index 498f0da239..91438f9248 100644 --- a/manifests/0000_50_olm_09-aggregated.clusterrole.yaml +++ b/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"] diff --git a/manifests/0000_50_olm_11-olm-operators.configmap.removed.yaml b/manifests/0000_50_olm_11-olm-operators.configmap.removed.yaml index 20933da5f7..1af39c5735 100644 --- a/manifests/0000_50_olm_11-olm-operators.configmap.removed.yaml +++ b/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" diff --git a/manifests/0000_50_olm_12-olm-operators.catalogsource.removed.yaml b/manifests/0000_50_olm_12-olm-operators.catalogsource.removed.yaml index e8009a6aba..341fd66c80 100644 --- a/manifests/0000_50_olm_12-olm-operators.catalogsource.removed.yaml +++ b/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" diff --git a/manifests/0000_50_olm_13-operatorgroup-default.yaml b/manifests/0000_50_olm_13-operatorgroup-default.yaml index 7d12692a02..a763b1d1af 100644 --- a/manifests/0000_50_olm_13-operatorgroup-default.yaml +++ b/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 diff --git a/manifests/0000_50_olm_14-packageserver.subscription.removed.yaml b/manifests/0000_50_olm_14-packageserver.subscription.removed.yaml index de62fdf1c4..49b0c7fd01 100644 --- a/manifests/0000_50_olm_14-packageserver.subscription.removed.yaml +++ b/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" diff --git a/manifests/0000_50_olm_15-csv-viewer.rbac.yaml b/manifests/0000_50_olm_15-csv-viewer.rbac.yaml index 41520f7194..c952cb99b1 100644 --- a/manifests/0000_50_olm_15-csv-viewer.rbac.yaml +++ b/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: diff --git a/manifests/0000_50_olm_99-operatorstatus.yaml b/manifests/0000_50_olm_99-operatorstatus.yaml index 359ce1f206..e1db34e22f 100644 --- a/manifests/0000_50_olm_99-operatorstatus.yaml +++ b/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 diff --git a/manifests/0000_90_olm_00-service-monitor.yaml b/manifests/0000_90_olm_00-service-monitor.yaml index 2ea19f4a64..8c765c02da 100644 --- a/manifests/0000_90_olm_00-service-monitor.yaml +++ b/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 diff --git a/manifests/0000_90_olm_01-prometheus-rule.yaml b/manifests/0000_90_olm_01-prometheus-rule.yaml index a9eeeb4fe1..b8a0422f09 100644 --- a/manifests/0000_90_olm_01-prometheus-rule.yaml +++ b/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 diff --git a/scripts/generate_crds_manifests.sh b/scripts/generate_crds_manifests.sh index dafa3f3056..0c88071f28 100755 --- a/scripts/generate_crds_manifests.sh +++ b/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 }