Skip to content

OPRUN-3588: OLM: add OperatorLifecycleManagerV1 capability to olms CRD #2097

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Nov 12, 2024
Merged

OPRUN-3588: OLM: add OperatorLifecycleManagerV1 capability to olms CRD #2097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions operator/v1/types_olm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
Expand Down
1 change: 1 addition & 0 deletions ...nerated.crd-manifests/0000_10_operator-lifecycle-manager_01_olms-CustomNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions ...ted.crd-manifests/0000_10_operator-lifecycle-manager_01_olms-DevPreviewNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions ...ed.crd-manifests/0000_10_operator-lifecycle-manager_01_olms-TechPreviewNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion operator/v1/zz_generated.featuregated-crd-manifests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions operator/v1/zz_generated.featuregated-crd-manifests/olms.operator.openshift.io/NewOLM.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down