Skip to content

Commit

Permalink
Enable the ibm-cloud-managed cluster profile on network.operator CRD
Browse files Browse the repository at this point in the history
By removing the annotation from types_network.go we can rely on the generators
to add the cluster profiles. This commit doesn't introduce any functional
changes as CNO was already annotating that CRD with the ibm-cloud-managed
cluster profile.

Signed-off-by: Patryk Diak <pdiak@redhat.com>
  • Loading branch information
kyrtapz committed May 17, 2024
1 parent 931fa98 commit 460ff9d
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 5 deletions.
1 change: 0 additions & 1 deletion operator/v1/types_network.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import (
// +kubebuilder:resource:path=networks,scope=Cluster
// +openshift:api-approved.openshift.io=https://github.com/openshift/api/pull/475
// +openshift:file-pattern=cvoRunLevel=0000_70,operatorName=network,operatorOrdering=01
// +kubebuilder:metadata:annotations=include.release.openshift.io/self-managed-high-availability=true

// Network describes the cluster's desired network configuration. It is
// consumed by the cluster-network-operator.
Expand Down
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/475
api.openshift.io/merged-by-featuregates: "true"
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
name: networks.operator.openshift.io
spec:
Expand Down
3 changes: 1 addition & 2 deletions operator/v1/zz_generated.featuregated-crd-manifests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -320,8 +320,7 @@ machineconfigurations.operator.openshift.io:
Version: v1

networks.operator.openshift.io:
Annotations:
include.release.openshift.io/self-managed-high-availability: "true"
Annotations: {}
ApprovedPRNumber: https://github.com/openshift/api/pull/475
CRDName: networks.operator.openshift.io
Capability: ""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ metadata:
api.openshift.io/filename-operator: network
api.openshift.io/filename-ordering: "01"
feature-gate.release.openshift.io/: "true"
include.release.openshift.io/self-managed-high-availability: "true"
name: networks.operator.openshift.io
spec:
group: operator.openshift.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ metadata:
api.openshift.io/filename-operator: network
api.openshift.io/filename-ordering: "01"
feature-gate.release.openshift.io/NetworkLiveMigration: "true"
include.release.openshift.io/self-managed-high-availability: "true"
name: networks.operator.openshift.io
spec:
group: operator.openshift.io
Expand Down

0 comments on commit 460ff9d

Please sign in to comment.