Move VolumeZone predicate to its Filter plugin

Signed-off-by: Zou Nengren <[email protected]>

Author: zouyee

pkg/scheduler/algorithm/predicates/BUILD

@@ -34,7 +34,6 @@ go_library(
         "//staging/src/k8s.io/client-go/listers/core/v1:go_default_library",
         "//staging/src/k8s.io/client-go/listers/storage/v1:go_default_library",
         "//staging/src/k8s.io/client-go/util/workqueue:go_default_library",
-        "//staging/src/k8s.io/cloud-provider/volume/helpers:go_default_library",
         "//staging/src/k8s.io/csi-translation-lib:go_default_library",
         "//staging/src/k8s.io/csi-translation-lib/plugins:go_default_library",
         "//vendor/k8s.io/klog:go_default_library",

pkg/scheduler/algorithm/predicates/predicates.go

@@ -34,7 +34,6 @@ import (
 	utilfeature "k8s.io/apiserver/pkg/util/feature"
 	corelisters "k8s.io/client-go/listers/core/v1"
 	storagelisters "k8s.io/client-go/listers/storage/v1"
-	volumehelpers "k8s.io/cloud-provider/volume/helpers"
 	csilibplugins "k8s.io/csi-translation-lib/plugins"
 	v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper"
 	"k8s.io/kubernetes/pkg/features"
@@ -535,137 +534,6 @@ var CinderVolumeFilter = VolumeFilter{
 	},
 }
 
-// VolumeZoneChecker contains information to check the volume zone for a predicate.
-type VolumeZoneChecker struct {
-	pvLister  corelisters.PersistentVolumeLister
-	pvcLister corelisters.PersistentVolumeClaimLister
-	scLister  storagelisters.StorageClassLister
-}
-
-// NewVolumeZonePredicate evaluates if a pod can fit due to the volumes it requests, given
-// that some volumes may have zone scheduling constraints.  The requirement is that any
-// volume zone-labels must match the equivalent zone-labels on the node.  It is OK for
-// the node to have more zone-label constraints (for example, a hypothetical replicated
-// volume might allow region-wide access)
-//
-// Currently this is only supported with PersistentVolumeClaims, and looks to the labels
-// only on the bound PersistentVolume.
-//
-// Working with volumes declared inline in the pod specification (i.e. not
-// using a PersistentVolume) is likely to be harder, as it would require
-// determining the zone of a volume during scheduling, and that is likely to
-// require calling out to the cloud provider.  It seems that we are moving away
-// from inline volume declarations anyway.
-func NewVolumeZonePredicate(pvLister corelisters.PersistentVolumeLister, pvcLister corelisters.PersistentVolumeClaimLister, scLister storagelisters.StorageClassLister) FitPredicate {
-	c := &VolumeZoneChecker{
-		pvLister:  pvLister,
-		pvcLister: pvcLister,
-		scLister:  scLister,
-	}
-	return c.predicate
-}
-
-func (c *VolumeZoneChecker) predicate(pod *v1.Pod, meta Metadata, nodeInfo *schedulernodeinfo.NodeInfo) (bool, []PredicateFailureReason, error) {
-	// If a pod doesn't have any volume attached to it, the predicate will always be true.
-	// Thus we make a fast path for it, to avoid unnecessary computations in this case.
-	if len(pod.Spec.Volumes) == 0 {
-		return true, nil, nil
-	}
-
-	node := nodeInfo.Node()
-	if node == nil {
-		return false, nil, fmt.Errorf("node not found")
-	}
-
-	nodeConstraints := make(map[string]string)
-	for k, v := range node.ObjectMeta.Labels {
-		if k != v1.LabelZoneFailureDomain && k != v1.LabelZoneRegion {
-			continue
-		}
-		nodeConstraints[k] = v
-	}
-
-	if len(nodeConstraints) == 0 {
-		// The node has no zone constraints, so we're OK to schedule.
-		// In practice, when using zones, all nodes must be labeled with zone labels.
-		// We want to fast-path this case though.
-		return true, nil, nil
-	}
-
-	namespace := pod.Namespace
-	manifest := &(pod.Spec)
-	for i := range manifest.Volumes {
-		volume := &manifest.Volumes[i]
-		if volume.PersistentVolumeClaim == nil {
-			continue
-		}
-		pvcName := volume.PersistentVolumeClaim.ClaimName
-		if pvcName == "" {
-			return false, nil, fmt.Errorf("PersistentVolumeClaim had no name")
-		}
-		pvc, err := c.pvcLister.PersistentVolumeClaims(namespace).Get(pvcName)
-		if err != nil {
-			return false, nil, err
-		}
-
-		if pvc == nil {
-			return false, nil, fmt.Errorf("PersistentVolumeClaim was not found: %q", pvcName)
-		}
-
-		pvName := pvc.Spec.VolumeName
-		if pvName == "" {
-			scName := v1helper.GetPersistentVolumeClaimClass(pvc)
-			if len(scName) == 0 {
-				return false, nil, fmt.Errorf("PersistentVolumeClaim had no pv name and storageClass name")
-			}
-
-			class, _ := c.scLister.Get(scName)
-			if class == nil {
-				return false, nil, fmt.Errorf("StorageClass %q claimed by PersistentVolumeClaim %q not found",
-					scName, pvcName)
-
-			}
-			if class.VolumeBindingMode == nil {
-				return false, nil, fmt.Errorf("VolumeBindingMode not set for StorageClass %q", scName)
-			}
-			if *class.VolumeBindingMode == storage.VolumeBindingWaitForFirstConsumer {
-				// Skip unbound volumes
-				continue
-			}
-
-			return false, nil, fmt.Errorf("PersistentVolume had no name")
-		}
-
-		pv, err := c.pvLister.Get(pvName)
-		if err != nil {
-			return false, nil, err
-		}
-
-		if pv == nil {
-			return false, nil, fmt.Errorf("PersistentVolume was not found: %q", pvName)
-		}
-
-		for k, v := range pv.ObjectMeta.Labels {
-			if k != v1.LabelZoneFailureDomain && k != v1.LabelZoneRegion {
-				continue
-			}
-			nodeV, _ := nodeConstraints[k]
-			volumeVSet, err := volumehelpers.LabelZonesToSet(v)
-			if err != nil {
-				klog.Warningf("Failed to parse label for %q: %q. Ignoring the label. err=%v. ", k, v, err)
-				continue
-			}
-
-			if !volumeVSet.Has(nodeV) {
-				klog.V(10).Infof("Won't schedule pod %q onto node %q due to volume %q (mismatch on %q)", pod.Name, node.Name, pvName, k)
-				return false, []PredicateFailureReason{ErrVolumeZoneConflict}, nil
-			}
-		}
-	}
-
-	return true, nil, nil
-}
-
 // GetResourceRequest returns a *schedulernodeinfo.Resource that covers the largest
 // width in each resource dimension. Because init-containers run sequentially, we collect
 // the max in each dimension iteratively. In contrast, we sum the resource vectors for