github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #76563 from shinytang6/clean-up-scheduler 

correct some comments in scheduler code
k3s-v1.15.3
Kubernetes Prow Robot 2019-04-14 22:18:01 -07:00 committed by GitHub
parent 76b877a93f 6d11926709
commit 445fc9fe52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/scheduler/algorithm/predicates/predicates.go
View File

@ -687,7 +687,7 @@ func (c *VolumeZoneChecker) predicate(pod *v1.Pod, meta PredicateMetadata, nodeI
} }
} }
} }
return false, nil, fmt.Errorf("PersistentVolumeClaim is not bound: %q", pvcName) return false, nil, fmt.Errorf("PersistentVolumeClaim was not found: %q", pvcName)
} }
pv, err := c.pvInfo.GetPersistentVolumeInfo(pvName) pv, err := c.pvInfo.GetPersistentVolumeInfo(pvName)
@ -696,7 +696,7 @@ func (c *VolumeZoneChecker) predicate(pod *v1.Pod, meta PredicateMetadata, nodeI
} }
if pv == nil { if pv == nil {
return false, nil, fmt.Errorf("PersistentVolume not found: %q", pvName) return false, nil, fmt.Errorf("PersistentVolume was not found: %q", pvName)
} }
for k, v := range pv.ObjectMeta.Labels { for k, v := range pv.ObjectMeta.Labels {

4
pkg/scheduler/algorithmprovider/defaults/defaults.go
View File

@ -59,13 +59,13 @@ func defaultPredicates() sets.String {
// ApplyFeatureGates applies algorithm by feature gates. // ApplyFeatureGates applies algorithm by feature gates.
func ApplyFeatureGates() { func ApplyFeatureGates() {
if utilfeature.DefaultFeatureGate.Enabled(features.TaintNodesByCondition) { if utilfeature.DefaultFeatureGate.Enabled(features.TaintNodesByCondition) {
// Remove "CheckNodeCondition", "CheckNodeMemoryPressure", "CheckNodePIDPressurePred" // Remove "CheckNodeCondition", "CheckNodeMemoryPressure", "CheckNodePIDPressure"
// and "CheckNodeDiskPressure" predicates // and "CheckNodeDiskPressure" predicates
factory.RemoveFitPredicate(predicates.CheckNodeConditionPred) factory.RemoveFitPredicate(predicates.CheckNodeConditionPred)
factory.RemoveFitPredicate(predicates.CheckNodeMemoryPressurePred) factory.RemoveFitPredicate(predicates.CheckNodeMemoryPressurePred)
factory.RemoveFitPredicate(predicates.CheckNodeDiskPressurePred) factory.RemoveFitPredicate(predicates.CheckNodeDiskPressurePred)
factory.RemoveFitPredicate(predicates.CheckNodePIDPressurePred) factory.RemoveFitPredicate(predicates.CheckNodePIDPressurePred)
// Remove key "CheckNodeCondition", "CheckNodeMemoryPressure" and "CheckNodeDiskPressure" // Remove key "CheckNodeCondition", "CheckNodeMemoryPressure", "CheckNodePIDPressure" and "CheckNodeDiskPressure"
// from ALL algorithm provider // from ALL algorithm provider
// The key will be removed from all providers which in algorithmProviderMap[] // The key will be removed from all providers which in algorithmProviderMap[]
// if you just want remove specific provider, call func RemovePredicateKeyFromAlgoProvider() // if you just want remove specific provider, call func RemovePredicateKeyFromAlgoProvider()