github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-27 21:26:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #96561 from ialidzhikov/cleanup/csi-node-info

Browse Source 
Remove CSINodeInfo feature gate
This commit is contained in:
Kubernetes Prow Robot
2021-01-05 11:46:00 -08:00
committed by GitHub
parent 1f64838041 bc432124a2
commit 07bd985724
26 changed files with 117 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/controller/volume/attachdetach/attach_detach_controller.go
View File

@@ -137,8 +137,7 @@ func NewAttachDetachController(
filteredDialOptions: filteredDialOptions,
}
if utilfeature.DefaultFeatureGate.Enabled(features.CSIMigration) &&
utilfeature.DefaultFeatureGate.Enabled(features.CSINodeInfo) {
if utilfeature.DefaultFeatureGate.Enabled(features.CSIMigration) {
adc.csiNodeLister = csiNodeInformer.Lister()
adc.csiNodeSynced = csiNodeInformer.Informer().HasSynced
}

8
pkg/controller/volume/attachdetach/util/util.go
View File

@@ -310,12 +310,8 @@ func translateInTreeSpecToCSIIfNeeded(spec *volume.Spec, nodeName types.NodeName
}
func isCSIMigrationSupportedOnNode(nodeName types.NodeName, spec *volume.Spec, vpm *volume.VolumePluginMgr, csiMigratedPluginManager csimigration.PluginManager) (bool, error) {
if !utilfeature.DefaultFeatureGate.Enabled(features.CSIMigration) ||
!utilfeature.DefaultFeatureGate.Enabled(features.CSINodeInfo) {
// If CSIMigration is disabled, CSI migration paths will not be taken for
// the node. If CSINodeInfo is disabled, checking of installation status
// of a migrated CSI plugin cannot be performed. Therefore stick to
// in-tree plugins.
if !utilfeature.DefaultFeatureGate.Enabled(features.CSIMigration) {
// If CSIMigration is disabled, CSI migration paths will not be taken for the node.
return false, nil
}