From 52c87654a1c9b5d030e8ce74eb6d7665ec216a8a Mon Sep 17 00:00:00 2001 From: Abirdcfly Date: Thu, 3 Mar 2022 13:12:49 +0800 Subject: [PATCH] simplify function MatchProvisioner Change-Id: I15b7507fed50032d0df7a91553ba58f764d92aac --- .../plugins/nodevolumelimits/non_csi.go | 28 ++++++------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/pkg/scheduler/framework/plugins/nodevolumelimits/non_csi.go b/pkg/scheduler/framework/plugins/nodevolumelimits/non_csi.go index 4297ddd1e41..4a2535e5f26 100644 --- a/pkg/scheduler/framework/plugins/nodevolumelimits/non_csi.go +++ b/pkg/scheduler/framework/plugins/nodevolumelimits/non_csi.go @@ -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 {