scheduler: make getVolumeLimits a function instead of a method

SataQiu · SataQiu · commit 92300eaadb25 · 2019-09-30T16:25:31.000+08:00
diff --git a/pkg/scheduler/algorithm/predicates/csi_volume_predicate.go b/pkg/scheduler/algorithm/predicates/csi_volume_predicate.go
@@ -67,7 +67,7 @@ func NewCSIMaxVolumeLimitPredicate(
 	return c.attachableLimitPredicate
 }
 
-func (c *CSIMaxVolumeLimitChecker) getVolumeLimits(nodeInfo *schedulernodeinfo.NodeInfo, csiNode *storagev1beta1.CSINode) map[v1.ResourceName]int64 {
+func getVolumeLimits(nodeInfo *schedulernodeinfo.NodeInfo, csiNode *storagev1beta1.CSINode) map[v1.ResourceName]int64 {
 	// TODO: stop getting values from Node object in v1.18
 	nodeVolumeLimits := nodeInfo.VolumeLimits()
 	if csiNode != nil {
@@ -117,7 +117,7 @@ func (c *CSIMaxVolumeLimitChecker) attachableLimitPredicate(
 	}
 
 	// If the node doesn't have volume limits, the predicate will always be true
-	nodeVolumeLimits := c.getVolumeLimits(nodeInfo, csiNode)
+	nodeVolumeLimits := getVolumeLimits(nodeInfo, csiNode)
 	if len(nodeVolumeLimits) == 0 {
 		return true, nil, nil
 	}

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ func NewCSIMaxVolumeLimitPredicate(`
`67`	`67`	`return c.attachableLimitPredicate`
`68`	`68`	`}`
`69`	`69`
`70`		`-func (c CSIMaxVolumeLimitChecker) getVolumeLimits(nodeInfo schedulernodeinfo.NodeInfo, csiNode *storagev1beta1.CSINode) map[v1.ResourceName]int64 {`
	`70`	`+func getVolumeLimits(nodeInfo schedulernodeinfo.NodeInfo, csiNode storagev1beta1.CSINode) map[v1.ResourceName]int64 {`
`71`	`71`	`// TODO: stop getting values from Node object in v1.18`
`72`	`72`	`nodeVolumeLimits := nodeInfo.VolumeLimits()`
`73`	`73`	`if csiNode != nil {`
`@@ -117,7 +117,7 @@ func (c *CSIMaxVolumeLimitChecker) attachableLimitPredicate(`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`// If the node doesn't have volume limits, the predicate will always be true`
`120`		`- nodeVolumeLimits := c.getVolumeLimits(nodeInfo, csiNode)`
	`120`	`+ nodeVolumeLimits := getVolumeLimits(nodeInfo, csiNode)`
`121`	`121`	`if len(nodeVolumeLimits) == 0 {`
`122`	`122`	`return true, nil, nil`
`123`	`123`	`}`