Merge pull request #83310 from SataQiu/clean-scheduler-20190930

scheduler: make getVolumeLimits a function instead of a method
This commit is contained in:
Kubernetes Prow Robot 2019-10-21 12:38:06 -07:00 committed by GitHub
commit 8138e8d012
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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
}