Merge pull request #108473 from Abirdcfly/master

simplify function MatchProvisioner
This commit is contained in:
Kubernetes Prow Robot 2022-03-03 10:43:59 -08:00 committed by GitHub
commit 72232dfb43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

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