github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #108473 from Abirdcfly/master

Browse Source 
simplify function MatchProvisioner
This commit is contained in:
Kubernetes Prow Robot
2022-03-03 10:43:59 -08:00
committed by GitHub
parent 7c6f09e4b0 52c87654a1
commit 72232dfb43
1 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
pkg/scheduler/framework/plugins/nodevolumelimits/non_csi.go
View File

@@ -416,11 +416,8 @@ var ebsVolumeFilter = VolumeFilter{
return "", false return "", false
}, },
MatchProvisioner: func(sc *storage.StorageClass) (relevant bool) { MatchProvisioner: func(sc *storage.StorageClass) bool {
if sc.Provisioner == csilibplugins.AWSEBSInTreePluginName { return sc.Provisioner == csilibplugins.AWSEBSInTreePluginName
return true
}
return false
}, },
IsMigrated: func(csiNode *storage.CSINode) bool { IsMigrated: func(csiNode *storage.CSINode) bool {
@@ -444,11 +441,8 @@ var gcePDVolumeFilter = VolumeFilter{
return "", false return "", false
}, },
MatchProvisioner: func(sc *storage.StorageClass) (relevant bool) { MatchProvisioner: func(sc *storage.StorageClass) bool {
if sc.Provisioner == csilibplugins.GCEPDInTreePluginName { return sc.Provisioner == csilibplugins.GCEPDInTreePluginName
return true
}
return false
}, },
IsMigrated: func(csiNode *storage.CSINode) bool { IsMigrated: func(csiNode *storage.CSINode) bool {
@@ -472,11 +466,8 @@ var azureDiskVolumeFilter = VolumeFilter{
return "", false return "", false
}, },
MatchProvisioner: func(sc *storage.StorageClass) (relevant bool) { MatchProvisioner: func(sc *storage.StorageClass) bool {
if sc.Provisioner == csilibplugins.AzureDiskInTreePluginName { return sc.Provisioner == csilibplugins.AzureDiskInTreePluginName
return true
}
return false
}, },
IsMigrated: func(csiNode *storage.CSINode) bool { IsMigrated: func(csiNode *storage.CSINode) bool {
@@ -501,11 +492,8 @@ var cinderVolumeFilter = VolumeFilter{
return "", false return "", false
}, },
MatchProvisioner: func(sc *storage.StorageClass) (relevant bool) { MatchProvisioner: func(sc *storage.StorageClass) bool {
if sc.Provisioner == csilibplugins.CinderInTreePluginName { return sc.Provisioner == csilibplugins.CinderInTreePluginName
return true
}
return false
}, },
IsMigrated: func(csiNode *storage.CSINode) bool { IsMigrated: func(csiNode *storage.CSINode) bool {