From 756128481957a107414d79bb5d0a1d3f6e92dec5 Mon Sep 17 00:00:00 2001 From: bzsuni Date: Tue, 17 Oct 2023 20:44:50 +0800 Subject: [PATCH] Remove GA featuregate about CSIMigrationvSphere in 1.29 Signed-off-by: bzsuni --- .../app/plugins_providers.go | 2 -- cmd/kubelet/app/plugins_providers.go | 2 -- pkg/features/kube_features.go | 8 ------- pkg/volume/csi/csi_plugin.go | 3 --- pkg/volume/csimigration/plugin_manager.go | 2 +- .../csimigration/plugin_manager_test.go | 22 ------------------- pkg/volume/vsphere_volume/vsphere_volume.go | 4 +--- 7 files changed, 2 insertions(+), 41 deletions(-) diff --git a/cmd/kube-controller-manager/app/plugins_providers.go b/cmd/kube-controller-manager/app/plugins_providers.go index 92a7625b2f7..999b42b623d 100644 --- a/cmd/kube-controller-manager/app/plugins_providers.go +++ b/cmd/kube-controller-manager/app/plugins_providers.go @@ -29,7 +29,6 @@ import ( "k8s.io/kubernetes/pkg/volume/csimigration" "k8s.io/kubernetes/pkg/volume/portworx" "k8s.io/kubernetes/pkg/volume/rbd" - "k8s.io/kubernetes/pkg/volume/vsphere_volume" ) type probeFn func() []volume.VolumePlugin @@ -61,7 +60,6 @@ type pluginInfo struct { func appendAttachableLegacyProviderVolumes(logger klog.Logger, allPlugins []volume.VolumePlugin, featureGate featuregate.FeatureGate) ([]volume.VolumePlugin, error) { pluginMigrationStatus := make(map[string]pluginInfo) - pluginMigrationStatus[plugins.VSphereInTreePluginName] = pluginInfo{pluginMigrationFeature: features.CSIMigrationvSphere, pluginUnregisterFeature: features.InTreePluginvSphereUnregister, pluginProbeFunction: vsphere_volume.ProbeVolumePlugins} pluginMigrationStatus[plugins.PortworxVolumePluginName] = pluginInfo{pluginMigrationFeature: features.CSIMigrationPortworx, pluginUnregisterFeature: features.InTreePluginPortworxUnregister, pluginProbeFunction: portworx.ProbeVolumePlugins} pluginMigrationStatus[plugins.RBDVolumePluginName] = pluginInfo{pluginMigrationFeature: features.CSIMigrationRBD, pluginUnregisterFeature: features.InTreePluginRBDUnregister, pluginProbeFunction: rbd.ProbeVolumePlugins} var err error diff --git a/cmd/kubelet/app/plugins_providers.go b/cmd/kubelet/app/plugins_providers.go index fd10d246437..98a0631496d 100644 --- a/cmd/kubelet/app/plugins_providers.go +++ b/cmd/kubelet/app/plugins_providers.go @@ -33,7 +33,6 @@ import ( "k8s.io/kubernetes/pkg/volume/csimigration" "k8s.io/kubernetes/pkg/volume/portworx" "k8s.io/kubernetes/pkg/volume/rbd" - "k8s.io/kubernetes/pkg/volume/vsphere_volume" ) type probeFn func() []volume.VolumePlugin @@ -66,7 +65,6 @@ type pluginInfo struct { func appendLegacyProviderVolumes(allPlugins []volume.VolumePlugin, featureGate featuregate.FeatureGate) ([]volume.VolumePlugin, error) { pluginMigrationStatus := make(map[string]pluginInfo) pluginMigrationStatus[plugins.AzureFileInTreePluginName] = pluginInfo{pluginMigrationFeature: features.CSIMigrationAzureFile, pluginUnregisterFeature: features.InTreePluginAzureFileUnregister, pluginProbeFunction: azure_file.ProbeVolumePlugins} - pluginMigrationStatus[plugins.VSphereInTreePluginName] = pluginInfo{pluginMigrationFeature: features.CSIMigrationvSphere, pluginUnregisterFeature: features.InTreePluginvSphereUnregister, pluginProbeFunction: vsphere_volume.ProbeVolumePlugins} pluginMigrationStatus[plugins.PortworxVolumePluginName] = pluginInfo{pluginMigrationFeature: features.CSIMigrationPortworx, pluginUnregisterFeature: features.InTreePluginPortworxUnregister, pluginProbeFunction: portworx.ProbeVolumePlugins} pluginMigrationStatus[plugins.RBDVolumePluginName] = pluginInfo{pluginMigrationFeature: features.CSIMigrationRBD, pluginUnregisterFeature: features.InTreePluginRBDUnregister, pluginProbeFunction: rbd.ProbeVolumePlugins} var err error diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index d0990feca59..ea87ada9aaf 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -158,12 +158,6 @@ const ( // Enables the RBD in-tree driver to RBD CSI Driver migration feature. CSIMigrationRBD featuregate.Feature = "CSIMigrationRBD" - // owner: @divyenpatel - // beta: v1.19 (requires: vSphere vCenter/ESXi Version: 7.0u2, HW Version: VM version 15) - // GA: 1.26 - // Enables the vSphere in-tree driver to vSphere CSI Driver migration feature. - CSIMigrationvSphere featuregate.Feature = "CSIMigrationvSphere" - // owner: @humblec, @zhucan // kep: https://kep.k8s.io/3171 // alpha: v1.25 @@ -932,8 +926,6 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS CSIMigrationRBD: {Default: false, PreRelease: featuregate.Deprecated}, // deprecated in 1.28, remove in 1.31 - CSIMigrationvSphere: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.29 - CSINodeExpandSecret: {Default: true, PreRelease: featuregate.Beta}, CSIVolumeHealth: {Default: false, PreRelease: featuregate.Alpha}, diff --git a/pkg/volume/csi/csi_plugin.go b/pkg/volume/csi/csi_plugin.go index ec3e62cf623..7176c826c15 100644 --- a/pkg/volume/csi/csi_plugin.go +++ b/pkg/volume/csi/csi_plugin.go @@ -236,9 +236,6 @@ func (p *csiPlugin) Init(host volume.VolumeHost) error { csitranslationplugins.AzureFileInTreePluginName: func() bool { return utilfeature.DefaultFeatureGate.Enabled(features.CSIMigrationAzureFile) }, - csitranslationplugins.VSphereInTreePluginName: func() bool { - return utilfeature.DefaultFeatureGate.Enabled(features.CSIMigrationvSphere) - }, csitranslationplugins.PortworxVolumePluginName: func() bool { return utilfeature.DefaultFeatureGate.Enabled(features.CSIMigrationPortworx) }, diff --git a/pkg/volume/csimigration/plugin_manager.go b/pkg/volume/csimigration/plugin_manager.go index c2749ea37ec..c38e8c5073b 100644 --- a/pkg/volume/csimigration/plugin_manager.go +++ b/pkg/volume/csimigration/plugin_manager.go @@ -99,7 +99,7 @@ func (pm PluginManager) IsMigrationEnabledForPlugin(pluginName string) bool { case csilibplugins.CinderInTreePluginName: return true case csilibplugins.VSphereInTreePluginName: - return pm.featureGate.Enabled(features.CSIMigrationvSphere) + return true case csilibplugins.PortworxVolumePluginName: return pm.featureGate.Enabled(features.CSIMigrationPortworx) case csilibplugins.RBDVolumePluginName: diff --git a/pkg/volume/csimigration/plugin_manager_test.go b/pkg/volume/csimigration/plugin_manager_test.go index eab04073dce..1d2c6f19cd7 100644 --- a/pkg/volume/csimigration/plugin_manager_test.go +++ b/pkg/volume/csimigration/plugin_manager_test.go @@ -123,28 +123,6 @@ func TestMigrationFeatureFlagStatus(t *testing.T) { csiMigrationResult: true, csiMigrationCompleteResult: true, }, - { - name: "vsphere-volume migration flag enabled and migration-complete flag disabled with CSI migration flag enabled", - pluginName: "kubernetes.io/vsphere-volume", - pluginFeature: features.CSIMigrationvSphere, - pluginFeatureEnabled: true, - csiMigrationEnabled: true, - inTreePluginUnregister: features.InTreePluginvSphereUnregister, - inTreePluginUnregisterEnabled: false, - csiMigrationResult: true, - csiMigrationCompleteResult: false, - }, - { - name: "vsphere-volume migration flag enabled and migration-complete flag enabled with CSI migration flag enabled", - pluginName: "kubernetes.io/vsphere-volume", - pluginFeature: features.CSIMigrationvSphere, - pluginFeatureEnabled: true, - csiMigrationEnabled: true, - inTreePluginUnregister: features.InTreePluginvSphereUnregister, - inTreePluginUnregisterEnabled: true, - csiMigrationResult: true, - csiMigrationCompleteResult: true, - }, } csiTranslator := csitrans.New() for _, test := range testCases { diff --git a/pkg/volume/vsphere_volume/vsphere_volume.go b/pkg/volume/vsphere_volume/vsphere_volume.go index 9d5dd3a4a7c..29936daebe7 100644 --- a/pkg/volume/vsphere_volume/vsphere_volume.go +++ b/pkg/volume/vsphere_volume/vsphere_volume.go @@ -26,7 +26,6 @@ import ( "runtime" "strings" - utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/klog/v2" "k8s.io/mount-utils" utilstrings "k8s.io/utils/strings" @@ -37,7 +36,6 @@ import ( "k8s.io/apimachinery/pkg/types" volumehelpers "k8s.io/cloud-provider/volume/helpers" - "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume/util" ) @@ -75,7 +73,7 @@ func (plugin *vsphereVolumePlugin) GetPluginName() string { } func (plugin *vsphereVolumePlugin) IsMigratedToCSI() bool { - return utilfeature.DefaultFeatureGate.Enabled(features.CSIMigrationvSphere) + return true } func (plugin *vsphereVolumePlugin) GetVolumeName(spec *volume.Spec) (string, error) {