scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2026-01-08 00:01:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #100947 from lojies/cleanuppkgsheduler

Browse Source 
code cleanup for pkg/scheduler
This commit is contained in:
Kubernetes Prow Robot
2021-04-13 00:44:50 -07:00
committed by GitHub
parent 61641a0640 5ddb1be59a
commit 1fa101d1a4
7 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/scheduler/framework/plugins/nodevolumelimits/csi.go
View File

@@ -75,7 +75,7 @@ func (pl *CSILimits) Filter(ctx context.Context, _ *framework.CycleState, pod *v
node := nodeInfo.Node()
if node == nil {
return framework.NewStatus(framework.Error, fmt.Sprintf("node not found"))
return framework.NewStatus(framework.Error, "node not found")
}
// If CSINode doesn't exist, the predicate may read the limits from Node object

2
pkg/scheduler/framework/plugins/nodevolumelimits/non_csi.go
View File

@@ -215,7 +215,7 @@ func (pl *nonCSILimits) Filter(ctx context.Context, _ *framework.CycleState, pod
node := nodeInfo.Node()
if node == nil {
return framework.NewStatus(framework.Error, fmt.Sprintf("node not found"))
return framework.NewStatus(framework.Error, "node not found")
}
var csiNode *storage.CSINode

3
pkg/scheduler/framework/plugins/selectorspread/selector_spread.go
View File

@@ -181,8 +181,7 @@ func (pl *SelectorSpread) PreScore(ctx context.Context, cycleState *framework.Cy
if skipSelectorSpread(pod) {
return nil
}
var selector labels.Selector
selector = helper.DefaultSelector(
selector := helper.DefaultSelector(
pod,
pl.services,
pl.replicationControllers,

6
pkg/scheduler/framework/plugins/volumezone/volume_zone.go
View File

@@ -123,7 +123,7 @@ func (pl *VolumeZone) Filter(ctx context.Context, _ *framework.CycleState, pod *
if pvName == "" {
scName := storagehelpers.GetPersistentVolumeClaimClass(pvc)
if len(scName) == 0 {
return framework.NewStatus(framework.Error, fmt.Sprint("PersistentVolumeClaim had no pv name and storageClass name"))
return framework.NewStatus(framework.Error, "PersistentVolumeClaim had no pv name and storageClass name")
}
class, _ := pl.scLister.Get(scName)
@@ -139,7 +139,7 @@ func (pl *VolumeZone) Filter(ctx context.Context, _ *framework.CycleState, pod *
continue
}
return framework.NewStatus(framework.Error, fmt.Sprint("PersistentVolume had no name"))
return framework.NewStatus(framework.Error, "PersistentVolume had no name")
}
pv, err := pl.pvLister.Get(pvName)
@@ -155,7 +155,7 @@ func (pl *VolumeZone) Filter(ctx context.Context, _ *framework.CycleState, pod *
if !volumeZoneLabels.Has(k) {
continue
}
nodeV, _ := nodeConstraints[k]
nodeV := nodeConstraints[k]
volumeVSet, err := volumehelpers.LabelZonesToSet(v)
if err != nil {
klog.InfoS("Failed to parse label, ignoring the label", "label", fmt.Sprintf("%s:%s", k, v), "err", err)