Skip to content

OCPBUGS-13914: allow removal of vsphereStorageDriver field in 4.14 #1464

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-robot merged 1 commit into from
May 31, 2023
Merged

OCPBUGS-13914: allow removal of vsphereStorageDriver field in 4.14 #1464

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
5 changes: 0 additions & 5 deletions operator/v1/0000_50_cluster_storage_operator_01_crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,8 @@ spec:
- LegacyDeprecatedInTreeDriver
- CSIWithMigrationDriver
x-kubernetes-validations:
- rule: oldSelf != "CSIWithMigrationDriver" || self == "CSIWithMigrationDriver"
message: VSphereStorageDriver can not be changed once it is set to CSIWithMigrationDriver
- rule: self != "LegacyDeprecatedInTreeDriver"
message: VSphereStorageDriver can not be set to LegacyDeprecatedInTreeDriver
x-kubernetes-validations:
- rule: '!has(oldSelf.vsphereStorageDriver) || has(self.vsphereStorageDriver)'
message: VSphereStorageDriver is required once set
status:
description: status holds observed values from the cluster. They may not be overridden.
type: object
Expand Down
21 changes: 16 additions & 5 deletions operator/v1/stable.storage.testsuite.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ tests:
kind: Storage
spec:
vsphereStorageDriver: LegacyDeprecatedInTreeDriver
expectedError: "VSphereStorageDriver can not be changed once it is set to CSIWithMigrationDriver"
- name: Should not allow changing CSIWithMigrationDriver to empty string
expectedError: "VSphereStorageDriver can not be set to LegacyDeprecatedInTreeDriver"
- name: Should allow changing CSIWithMigrationDriver to empty string
initial: |
apiVersion: operator.openshift.io/v1
kind: Storage
Expand All @@ -88,8 +88,14 @@ tests:
kind: Storage
spec:
vsphereStorageDriver: ""
expectedError: "VSphereStorageDriver can not be changed once it is set to CSIWithMigrationDriver"
- name: Should not allow unsetting VSphereStorageDriver once it is set
expected: |
apiVersion: operator.openshift.io/v1
kind: Storage
spec:
vsphereStorageDriver: ""
logLevel: Normal
operatorLogLevel: Normal
- name: Should allow unsetting VSphereStorageDriver once it is set
initial: |
apiVersion: operator.openshift.io/v1
kind: Storage
Expand All @@ -99,4 +105,9 @@ tests:
apiVersion: operator.openshift.io/v1
kind: Storage
spec: {}
expectedError: "VSphereStorageDriver is required once set"
expected: |
apiVersion: operator.openshift.io/v1
kind: Storage
spec:
logLevel: Normal
operatorLogLevel: Normal
2 changes: 0 additions & 2 deletions operator/v1/types_storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ const (
)

// StorageSpec is the specification of the desired behavior of the cluster storage operator.
// +kubebuilder:validation:XValidation:rule="!has(oldSelf.vsphereStorageDriver) || has(self.vsphereStorageDriver)", message="VSphereStorageDriver is required once set"
type StorageSpec struct {
OperatorSpec `json:",inline"`

Expand All @@ -49,7 +48,6 @@ type StorageSpec struct {
// which may change over time without notice.
// The current default is CSIWithMigrationDriver and may not be changed.
// DEPRECATED: This field will be removed in a future release.
// +kubebuilder:validation:XValidation:rule="oldSelf != \"CSIWithMigrationDriver\" || self == \"CSIWithMigrationDriver\"",message="VSphereStorageDriver can not be changed once it is set to CSIWithMigrationDriver"
// +kubebuilder:validation:XValidation:rule="self != \"LegacyDeprecatedInTreeDriver\"",message="VSphereStorageDriver can not be set to LegacyDeprecatedInTreeDriver"
// +optional
VSphereStorageDriver StorageDriverType `json:"vsphereStorageDriver"`
Expand Down