diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index e238d8dfb47..34f55c6ef93 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -307,48 +307,12 @@ const ( // deletion ordering. HonorPVReclaimPolicy featuregate.Feature = "HonorPVReclaimPolicy" - // owner: @leakingtapan - // alpha: v1.21 - // - // Disables the AWS EBS in-tree driver. - InTreePluginAWSUnregister featuregate.Feature = "InTreePluginAWSUnregister" - - // owner: @andyzhangx - // alpha: v1.21 - // - // Disables the Azure Disk in-tree driver. - InTreePluginAzureDiskUnregister featuregate.Feature = "InTreePluginAzureDiskUnregister" - - // owner: @andyzhangx - // alpha: v1.21 - // - // Disables the Azure File in-tree driver. - InTreePluginAzureFileUnregister featuregate.Feature = "InTreePluginAzureFileUnregister" - - // owner: @Jiawei0227 - // alpha: v1.21 - // - // Disables the GCE PD in-tree driver. - InTreePluginGCEUnregister featuregate.Feature = "InTreePluginGCEUnregister" - - // owner: @adisky - // alpha: v1.21 - // - // Disables the OpenStack Cinder in-tree driver. - InTreePluginOpenStackUnregister featuregate.Feature = "InTreePluginOpenStackUnregister" - // owner: @trierra // alpha: v1.23 // // Disables the Portworx in-tree driver. InTreePluginPortworxUnregister featuregate.Feature = "InTreePluginPortworxUnregister" - // owner: @divyenpatel - // alpha: v1.21 - // - // Disables the vSphere in-tree driver. - InTreePluginvSphereUnregister featuregate.Feature = "InTreePluginvSphereUnregister" - // owner: @mimowo // kep: https://kep.k8s.io/3850 // alpha: v1.28 @@ -1092,20 +1056,8 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS ImageMaximumGCAge: {Default: true, PreRelease: featuregate.Beta}, - InTreePluginAWSUnregister: {Default: false, PreRelease: featuregate.Alpha}, - - InTreePluginAzureDiskUnregister: {Default: false, PreRelease: featuregate.Alpha}, - - InTreePluginAzureFileUnregister: {Default: false, PreRelease: featuregate.Alpha}, - - InTreePluginGCEUnregister: {Default: false, PreRelease: featuregate.Alpha}, - - InTreePluginOpenStackUnregister: {Default: false, PreRelease: featuregate.Alpha}, - InTreePluginPortworxUnregister: {Default: false, PreRelease: featuregate.Alpha}, - InTreePluginvSphereUnregister: {Default: false, PreRelease: featuregate.Alpha}, - JobBackoffLimitPerIndex: {Default: true, PreRelease: featuregate.Beta}, JobManagedBy: {Default: false, PreRelease: featuregate.Alpha}, diff --git a/pkg/volume/csimigration/plugin_manager.go b/pkg/volume/csimigration/plugin_manager.go index 9bef59384ce..1ab7d8a9b17 100644 --- a/pkg/volume/csimigration/plugin_manager.go +++ b/pkg/volume/csimigration/plugin_manager.go @@ -61,17 +61,17 @@ func (pm PluginManager) IsMigrationCompleteForPlugin(pluginName string) bool { switch pluginName { case csilibplugins.AWSEBSInTreePluginName: - return pm.featureGate.Enabled(features.InTreePluginAWSUnregister) + return true case csilibplugins.GCEPDInTreePluginName: - return pm.featureGate.Enabled(features.InTreePluginGCEUnregister) + return true case csilibplugins.AzureFileInTreePluginName: - return pm.featureGate.Enabled(features.InTreePluginAzureFileUnregister) + return true case csilibplugins.AzureDiskInTreePluginName: - return pm.featureGate.Enabled(features.InTreePluginAzureDiskUnregister) + return true case csilibplugins.CinderInTreePluginName: - return pm.featureGate.Enabled(features.InTreePluginOpenStackUnregister) + return true case csilibplugins.VSphereInTreePluginName: - return pm.featureGate.Enabled(features.InTreePluginvSphereUnregister) + return true case csilibplugins.PortworxVolumePluginName: return pm.featureGate.Enabled(features.InTreePluginPortworxUnregister) default: