github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-12-06 00:05:52 +00:00
Code Issues Projects Releases Wiki Activity

Break volumezone Filter plugins dependency on predicates package

Browse Source
This commit is contained in:
Haosdent Huang
2020-01-06 03:14:00 +08:00
parent f3df7a2fdb
commit 320c9bfeed
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,7 +28,6 @@ import (
volumehelpers "k8s.io/cloud-provider/volume/helpers"
"k8s.io/klog"
v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper"
"k8s.io/kubernetes/pkg/scheduler/algorithm/predicates"
framework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1"
"k8s.io/kubernetes/pkg/scheduler/nodeinfo"
)
@@ -42,8 +41,13 @@ type VolumeZone struct {
var _ framework.FilterPlugin = &VolumeZone{}
// Name is the name of the plugin used in the plugin registry and configurations.
const Name = "VolumeZone"
const (
// Name is the name of the plugin used in the plugin registry and configurations.
Name = "VolumeZone"
// ErrReasonConflict is used for NoVolumeZoneConflict predicate error.
ErrReasonConflict = "node(s) had no available volume zone"
)
// Name returns name of the plugin. It is used in logs, etc.
func (pl *VolumeZone) Name() string {
@@ -153,7 +157,7 @@ func (pl *VolumeZone) Filter(ctx context.Context, _ *framework.CycleState, pod *
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 framework.NewStatus(framework.UnschedulableAndUnresolvable, predicates.ErrVolumeZoneConflict.GetReason())
return framework.NewStatus(framework.UnschedulableAndUnresolvable, ErrReasonConflict)
}
}
}