github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #124815 from carlory/remove-some-InTreePluginXXXUnregister

Browse Source 
remove some InTreePluginXXXUnregister
This commit is contained in:
Kubernetes Prow Robot 2024-07-23 03:16:23 -07:00 committed by GitHub
commit 2171bcb789
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
pkg/features/kube_features.go
View File

@ -307,48 +307,12 @@ const (
// deletion ordering. // deletion ordering.
HonorPVReclaimPolicy featuregate.Feature = "HonorPVReclaimPolicy" 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 // owner: @trierra
// alpha: v1.23 // alpha: v1.23
// //
// Disables the Portworx in-tree driver. // Disables the Portworx in-tree driver.
InTreePluginPortworxUnregister featuregate.Feature = "InTreePluginPortworxUnregister" InTreePluginPortworxUnregister featuregate.Feature = "InTreePluginPortworxUnregister"
// owner: @divyenpatel
// alpha: v1.21
//
// Disables the vSphere in-tree driver.
InTreePluginvSphereUnregister featuregate.Feature = "InTreePluginvSphereUnregister"
// owner: @mimowo // owner: @mimowo
// kep: https://kep.k8s.io/3850 // kep: https://kep.k8s.io/3850
// alpha: v1.28 // alpha: v1.28
@ -1092,20 +1056,8 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
ImageMaximumGCAge: {Default: true, PreRelease: featuregate.Beta}, 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}, InTreePluginPortworxUnregister: {Default: false, PreRelease: featuregate.Alpha},
InTreePluginvSphereUnregister: {Default: false, PreRelease: featuregate.Alpha},
JobBackoffLimitPerIndex: {Default: true, PreRelease: featuregate.Beta}, JobBackoffLimitPerIndex: {Default: true, PreRelease: featuregate.Beta},
JobManagedBy: {Default: false, PreRelease: featuregate.Alpha}, JobManagedBy: {Default: false, PreRelease: featuregate.Alpha},

12
pkg/volume/csimigration/plugin_manager.go
View File

@ -61,17 +61,17 @@ func (pm PluginManager) IsMigrationCompleteForPlugin(pluginName string) bool {
switch pluginName { switch pluginName {
case csilibplugins.AWSEBSInTreePluginName: case csilibplugins.AWSEBSInTreePluginName:
return pm.featureGate.Enabled(features.InTreePluginAWSUnregister) return true
case csilibplugins.GCEPDInTreePluginName: case csilibplugins.GCEPDInTreePluginName:
return pm.featureGate.Enabled(features.InTreePluginGCEUnregister) return true
case csilibplugins.AzureFileInTreePluginName: case csilibplugins.AzureFileInTreePluginName:
return pm.featureGate.Enabled(features.InTreePluginAzureFileUnregister) return true
case csilibplugins.AzureDiskInTreePluginName: case csilibplugins.AzureDiskInTreePluginName:
return pm.featureGate.Enabled(features.InTreePluginAzureDiskUnregister) return true
case csilibplugins.CinderInTreePluginName: case csilibplugins.CinderInTreePluginName:
return pm.featureGate.Enabled(features.InTreePluginOpenStackUnregister) return true
case csilibplugins.VSphereInTreePluginName: case csilibplugins.VSphereInTreePluginName:
return pm.featureGate.Enabled(features.InTreePluginvSphereUnregister) return true
case csilibplugins.PortworxVolumePluginName: case csilibplugins.PortworxVolumePluginName:
return pm.featureGate.Enabled(features.InTreePluginPortworxUnregister) return pm.featureGate.Enabled(features.InTreePluginPortworxUnregister)
default: default: