remove VSphereDriverConfiguration feature gate

Author: RomanBednar

features.md

@@ -95,5 +95,4 @@
 | SetEIPForNLBIngressController| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | UserNamespacesPodSecurityStandards| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | UserNamespacesSupport| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
-| VSphereDriverConfiguration| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | ValidatingAdmissionPolicy| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |

features/features.go

@@ -555,14 +555,6 @@ var (
 						enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
 						mustRegister()
 
-	FeatureGateVSphereDriverConfiguration = newFeatureGate("VSphereDriverConfiguration").
-						reportProblemsToJiraComponent("Storage / Kubernetes External Components").
-						contactPerson("rbednar").
-						productScope(ocpSpecific).
-						enhancementPR(legacyFeatureGateWithoutEnhancement).
-						enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-						mustRegister()
-
 	FeatureGateClusterAPIInstallIBMCloud = newFeatureGate("ClusterAPIInstallIBMCloud").
 						reportProblemsToJiraComponent("Installer").
 						contactPerson("cjschaef").
@@ -814,7 +806,7 @@ var (
 					enhancementPR("https://github.com/openshift/enhancements/pull/1779").
 					enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
 					mustRegister()
-					
+
 	FeatureGateAWSDedicatedHosts = newFeatureGate("AWSDedicatedHosts").
 					reportProblemsToJiraComponent("Installer").
 					contactPerson("faermanj").

operator/v1/tests/clustercsidrivers.operator.openshift.io/VSphereDriverConfiguration.yaml

@@ -1,8 +1,6 @@
 apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this
 name: "ClusterCSIDriver"
 crdName: clustercsidrivers.operator.openshift.io
-featureGates:
-- VSphereDriverConfiguration
 tests:
   onCreate:
   - name: Should be able to create ClusterCSIDriver with snapshot options

operator/v1/types_csi_cluster_driver.go

@@ -348,7 +348,6 @@ type VSphereCSIDriverConfigSpec struct {
 	// Volume snapshot documentation: https://docs.vmware.com/en/VMware-vSphere-Container-Storage-Plug-in/3.0/vmware-vsphere-csp-getting-started/GUID-E0B41C69-7EEB-450F-A73D-5FD2FF39E891.html
 	// +kubebuilder:validation:Minimum=1
 	// +kubebuilder:validation:Maximum=32
-	// +openshift:enable:FeatureGate=VSphereDriverConfiguration
 	// +optional
 	GlobalMaxSnapshotsPerBlockVolume *uint32 `json:"globalMaxSnapshotsPerBlockVolume,omitempty"`
 
@@ -357,7 +356,6 @@ type VSphereCSIDriverConfigSpec struct {
 	// Snapshots for VSAN can not be disabled using this parameter.
 	// +kubebuilder:validation:Minimum=1
 	// +kubebuilder:validation:Maximum=32
-	// +openshift:enable:FeatureGate=VSphereDriverConfiguration
 	// +optional
 	GranularMaxSnapshotsPerBlockVolumeInVSAN *uint32 `json:"granularMaxSnapshotsPerBlockVolumeInVSAN,omitempty"`
 
@@ -366,7 +364,6 @@ type VSphereCSIDriverConfigSpec struct {
 	// Snapshots for VVOL can not be disabled using this parameter.
 	// +kubebuilder:validation:Minimum=1
 	// +kubebuilder:validation:Maximum=32
-	// +openshift:enable:FeatureGate=VSphereDriverConfiguration
 	// +optional
 	GranularMaxSnapshotsPerBlockVolumeInVVOL *uint32 `json:"granularMaxSnapshotsPerBlockVolumeInVVOL,omitempty"`
 

operator/v1/zz_generated.featuregated-crd-manifests.yaml

@@ -71,7 +71,6 @@ clustercsidrivers.operator.openshift.io:
   FeatureGates:
   - AWSEFSDriverVolumeMetrics
   - VSphereConfigurableMaxAllowedBlockVolumesPerNode
-  - VSphereDriverConfiguration
   FilenameOperatorName: csi-driver
   FilenameOperatorOrdering: "01"
   FilenameRunLevel: "0000_50"

operator/v1/zz_generated.featuregated-crd-manifests/clustercsidrivers.operator.openshift.io/AAA_ungated.yaml

@@ -191,6 +191,35 @@ spec:
                   vSphere:
                     description: vSphere is used to configure the vsphere CSI driver.
                     properties:
+                      globalMaxSnapshotsPerBlockVolume:
+                        description: |-
+                          globalMaxSnapshotsPerBlockVolume is a global configuration parameter that applies to volumes on all kinds of
+                          datastores. If omitted, the platform chooses a default, which is subject to change over time, currently that default is 3.
+                          Snapshots can not be disabled using this parameter.
+                          Increasing number of snapshots above 3 can have negative impact on performance, for more details see: https://kb.vmware.com/s/article/1025279
+                          Volume snapshot documentation: https://docs.vmware.com/en/VMware-vSphere-Container-Storage-Plug-in/3.0/vmware-vsphere-csp-getting-started/GUID-E0B41C69-7EEB-450F-A73D-5FD2FF39E891.html
+                        format: int32
+                        maximum: 32
+                        minimum: 1
+                        type: integer
+                      granularMaxSnapshotsPerBlockVolumeInVSAN:
+                        description: |-
+                          granularMaxSnapshotsPerBlockVolumeInVSAN is a granular configuration parameter on vSAN datastore only. It
+                          overrides GlobalMaxSnapshotsPerBlockVolume if set, while it falls back to the global constraint if unset.
+                          Snapshots for VSAN can not be disabled using this parameter.
+                        format: int32
+                        maximum: 32
+                        minimum: 1
+                        type: integer
+                      granularMaxSnapshotsPerBlockVolumeInVVOL:
+                        description: |-
+                          granularMaxSnapshotsPerBlockVolumeInVVOL is a granular configuration parameter on Virtual Volumes datastore only.
+                          It overrides GlobalMaxSnapshotsPerBlockVolume if set, while it falls back to the global constraint if unset.
+                          Snapshots for VVOL can not be disabled using this parameter.
+                        format: int32
+                        maximum: 32
+                        minimum: 1
+                        type: integer
                       topologyCategories:
                         description: |-
                           topologyCategories indicates tag categories with which

operator/v1/zz_generated.featuregated-crd-manifests/clustercsidrivers.operator.openshift.io/AWSEFSDriverVolumeMetrics.yaml

@@ -235,6 +235,35 @@ spec:
                   vSphere:
                     description: vSphere is used to configure the vsphere CSI driver.
                     properties:
+                      globalMaxSnapshotsPerBlockVolume:
+                        description: |-
+                          globalMaxSnapshotsPerBlockVolume is a global configuration parameter that applies to volumes on all kinds of
+                          datastores. If omitted, the platform chooses a default, which is subject to change over time, currently that default is 3.
+                          Snapshots can not be disabled using this parameter.
+                          Increasing number of snapshots above 3 can have negative impact on performance, for more details see: https://kb.vmware.com/s/article/1025279
+                          Volume snapshot documentation: https://docs.vmware.com/en/VMware-vSphere-Container-Storage-Plug-in/3.0/vmware-vsphere-csp-getting-started/GUID-E0B41C69-7EEB-450F-A73D-5FD2FF39E891.html
+                        format: int32
+                        maximum: 32
+                        minimum: 1
+                        type: integer
+                      granularMaxSnapshotsPerBlockVolumeInVSAN:
+                        description: |-
+                          granularMaxSnapshotsPerBlockVolumeInVSAN is a granular configuration parameter on vSAN datastore only. It
+                          overrides GlobalMaxSnapshotsPerBlockVolume if set, while it falls back to the global constraint if unset.
+                          Snapshots for VSAN can not be disabled using this parameter.
+                        format: int32
+                        maximum: 32
+                        minimum: 1
+                        type: integer
+                      granularMaxSnapshotsPerBlockVolumeInVVOL:
+                        description: |-
+                          granularMaxSnapshotsPerBlockVolumeInVVOL is a granular configuration parameter on Virtual Volumes datastore only.
+                          It overrides GlobalMaxSnapshotsPerBlockVolume if set, while it falls back to the global constraint if unset.
+                          Snapshots for VVOL can not be disabled using this parameter.
+                        format: int32
+                        maximum: 32
+                        minimum: 1
+                        type: integer
                       topologyCategories:
                         description: |-
                           topologyCategories indicates tag categories with which

operator/v1/zz_generated.featuregated-crd-manifests/clustercsidrivers.operator.openshift.io/VSphereConfigurableMaxAllowedBlockVolumesPerNode.yaml

@@ -191,6 +191,35 @@ spec:
                   vSphere:
                     description: vSphere is used to configure the vsphere CSI driver.
                     properties:
+                      globalMaxSnapshotsPerBlockVolume:
+                        description: |-
+                          globalMaxSnapshotsPerBlockVolume is a global configuration parameter that applies to volumes on all kinds of
+                          datastores. If omitted, the platform chooses a default, which is subject to change over time, currently that default is 3.
+                          Snapshots can not be disabled using this parameter.
+                          Increasing number of snapshots above 3 can have negative impact on performance, for more details see: https://kb.vmware.com/s/article/1025279
+                          Volume snapshot documentation: https://docs.vmware.com/en/VMware-vSphere-Container-Storage-Plug-in/3.0/vmware-vsphere-csp-getting-started/GUID-E0B41C69-7EEB-450F-A73D-5FD2FF39E891.html
+                        format: int32
+                        maximum: 32
+                        minimum: 1
+                        type: integer
+                      granularMaxSnapshotsPerBlockVolumeInVSAN:
+                        description: |-
+                          granularMaxSnapshotsPerBlockVolumeInVSAN is a granular configuration parameter on vSAN datastore only. It
+                          overrides GlobalMaxSnapshotsPerBlockVolume if set, while it falls back to the global constraint if unset.
+                          Snapshots for VSAN can not be disabled using this parameter.
+                        format: int32
+                        maximum: 32
+                        minimum: 1
+                        type: integer
+                      granularMaxSnapshotsPerBlockVolumeInVVOL:
+                        description: |-
+                          granularMaxSnapshotsPerBlockVolumeInVVOL is a granular configuration parameter on Virtual Volumes datastore only.
+                          It overrides GlobalMaxSnapshotsPerBlockVolume if set, while it falls back to the global constraint if unset.
+                          Snapshots for VVOL can not be disabled using this parameter.
+                        format: int32
+                        maximum: 32
+                        minimum: 1
+                        type: integer
                       maxAllowedBlockVolumesPerNode:
                         description: |-
                           maxAllowedBlockVolumesPerNode is an optional configuration parameter that allows setting a custom value for the