diff --git a/operator/v1/types_olm.go b/operator/v1/types_olm.go index 84d7e9ea114..f70bc698b30 100644 --- a/operator/v1/types_olm.go +++ b/operator/v1/types_olm.go @@ -16,6 +16,7 @@ import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" // +openshift:api-approved.openshift.io=https://github.com/openshift/api/pull/1504 // +openshift:file-pattern=cvoRunLevel=0000_10,operatorName=operator-lifecycle-manager,operatorOrdering=01 // +openshift:enable:FeatureGate=NewOLM +// +openshift:capability=OperatorLifecycleManagerV1 // +kubebuilder:validation:XValidation:rule="self.metadata.name == 'cluster'",message="olm is a singleton, .metadata.name must be 'cluster'" type OLM struct { metav1.TypeMeta `json:",inline"` diff --git a/operator/v1/zz_generated.crd-manifests/0000_10_operator-lifecycle-manager_01_olms-CustomNoUpgrade.crd.yaml b/operator/v1/zz_generated.crd-manifests/0000_10_operator-lifecycle-manager_01_olms-CustomNoUpgrade.crd.yaml index db2e8bfdcdc..1b6b360241c 100644 --- a/operator/v1/zz_generated.crd-manifests/0000_10_operator-lifecycle-manager_01_olms-CustomNoUpgrade.crd.yaml +++ b/operator/v1/zz_generated.crd-manifests/0000_10_operator-lifecycle-manager_01_olms-CustomNoUpgrade.crd.yaml @@ -4,6 +4,7 @@ metadata: annotations: api-approved.openshift.io: https://github.com/openshift/api/pull/1504 api.openshift.io/merged-by-featuregates: "true" + capability.openshift.io/name: OperatorLifecycleManagerV1 include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" release.openshift.io/feature-set: CustomNoUpgrade diff --git a/operator/v1/zz_generated.crd-manifests/0000_10_operator-lifecycle-manager_01_olms-DevPreviewNoUpgrade.crd.yaml b/operator/v1/zz_generated.crd-manifests/0000_10_operator-lifecycle-manager_01_olms-DevPreviewNoUpgrade.crd.yaml index 6ea3c7949ee..575a0a1141f 100644 --- a/operator/v1/zz_generated.crd-manifests/0000_10_operator-lifecycle-manager_01_olms-DevPreviewNoUpgrade.crd.yaml +++ b/operator/v1/zz_generated.crd-manifests/0000_10_operator-lifecycle-manager_01_olms-DevPreviewNoUpgrade.crd.yaml @@ -4,6 +4,7 @@ metadata: annotations: api-approved.openshift.io: https://github.com/openshift/api/pull/1504 api.openshift.io/merged-by-featuregates: "true" + capability.openshift.io/name: OperatorLifecycleManagerV1 include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" release.openshift.io/feature-set: DevPreviewNoUpgrade diff --git a/operator/v1/zz_generated.crd-manifests/0000_10_operator-lifecycle-manager_01_olms-TechPreviewNoUpgrade.crd.yaml b/operator/v1/zz_generated.crd-manifests/0000_10_operator-lifecycle-manager_01_olms-TechPreviewNoUpgrade.crd.yaml index e13ebeee367..cb522290e71 100644 --- a/operator/v1/zz_generated.crd-manifests/0000_10_operator-lifecycle-manager_01_olms-TechPreviewNoUpgrade.crd.yaml +++ b/operator/v1/zz_generated.crd-manifests/0000_10_operator-lifecycle-manager_01_olms-TechPreviewNoUpgrade.crd.yaml @@ -4,6 +4,7 @@ metadata: annotations: api-approved.openshift.io: https://github.com/openshift/api/pull/1504 api.openshift.io/merged-by-featuregates: "true" + capability.openshift.io/name: OperatorLifecycleManagerV1 include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" release.openshift.io/feature-set: TechPreviewNoUpgrade diff --git a/operator/v1/zz_generated.featuregated-crd-manifests.yaml b/operator/v1/zz_generated.featuregated-crd-manifests.yaml index ae9a88c228b..4feeafff9c7 100644 --- a/operator/v1/zz_generated.featuregated-crd-manifests.yaml +++ b/operator/v1/zz_generated.featuregated-crd-manifests.yaml @@ -350,7 +350,7 @@ olms.operator.openshift.io: Annotations: {} ApprovedPRNumber: https://github.com/openshift/api/pull/1504 CRDName: olms.operator.openshift.io - Capability: "" + Capability: OperatorLifecycleManagerV1 Category: "" FeatureGates: - NewOLM diff --git a/operator/v1/zz_generated.featuregated-crd-manifests/olms.operator.openshift.io/NewOLM.yaml b/operator/v1/zz_generated.featuregated-crd-manifests/olms.operator.openshift.io/NewOLM.yaml index a4f04a6bdb2..3dd5726d39b 100644 --- a/operator/v1/zz_generated.featuregated-crd-manifests/olms.operator.openshift.io/NewOLM.yaml +++ b/operator/v1/zz_generated.featuregated-crd-manifests/olms.operator.openshift.io/NewOLM.yaml @@ -6,6 +6,7 @@ metadata: api.openshift.io/filename-cvo-runlevel: "0000_10" api.openshift.io/filename-operator: operator-lifecycle-manager api.openshift.io/filename-ordering: "01" + capability.openshift.io/name: OperatorLifecycleManagerV1 feature-gate.release.openshift.io/NewOLM: "true" name: olms.operator.openshift.io spec: