diff --git a/Gopkg.lock b/Gopkg.lock index 8165d21a8f2..25012f504dc 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -204,7 +204,7 @@ [[projects]] branch = "master" - digest = "1:4281fb8a5ed4671cd7e80c85599e00912f796819716abaefd697797ec9eb4491" + digest = "1:eb464defd8ffc1e575a37053e9809cc4c95dae8206a130997e956de379196a82" name = "github.com/kubernetes-sigs/kube-batch" packages = [ "cmd/kube-batch/app", @@ -247,7 +247,7 @@ "pkg/version", ] pruneopts = "UT" - revision = "700381278a3e7da396507055d371dd93c1724322" + revision = "865447b55d5402fafb09f3cdd3400984688cfa07" source = "https://github.com/volcano-sh/scheduler" [[projects]] diff --git a/vendor/github.com/kubernetes-sigs/kube-batch/cmd/kube-batch/app/server.go b/vendor/github.com/kubernetes-sigs/kube-batch/cmd/kube-batch/app/server.go index f0e1491d72a..1fbe6f415eb 100644 --- a/vendor/github.com/kubernetes-sigs/kube-batch/cmd/kube-batch/app/server.go +++ b/vendor/github.com/kubernetes-sigs/kube-batch/cmd/kube-batch/app/server.go @@ -103,7 +103,7 @@ func Run(opt *options.ServerOption) error { // Prepare event clients. broadcaster := record.NewBroadcaster() broadcaster.StartRecordingToSink(&corev1.EventSinkImpl{Interface: leaderElectionClient.CoreV1().Events(opt.LockObjectNamespace)}) - eventRecorder := broadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: "kube-batch"}) + eventRecorder := broadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: opt.SchedulerName}) hostname, err := os.Hostname() if err != nil { diff --git a/vendor/github.com/kubernetes-sigs/kube-batch/pkg/scheduler/cache/cache.go b/vendor/github.com/kubernetes-sigs/kube-batch/pkg/scheduler/cache/cache.go index f6f1c04d2e3..96dcc3c37df 100644 --- a/vendor/github.com/kubernetes-sigs/kube-batch/pkg/scheduler/cache/cache.go +++ b/vendor/github.com/kubernetes-sigs/kube-batch/pkg/scheduler/cache/cache.go @@ -200,7 +200,7 @@ func newSchedulerCache(config *rest.Config, schedulerName string, defaultQueue s // Prepare event clients. broadcaster := record.NewBroadcaster() broadcaster.StartRecordingToSink(&corev1.EventSinkImpl{Interface: sc.kubeclient.CoreV1().Events("")}) - sc.Recorder = broadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: "kube-batch"}) + sc.Recorder = broadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: schedulerName}) sc.Binder = &defaultBinder{ kubeclient: sc.kubeclient, @@ -465,7 +465,10 @@ func (sc *SchedulerCache) taskUnschedulable(task *api.TaskInfo, message string) pod := task.Pod.DeepCopy() - sc.Recorder.Eventf(pod, v1.EventTypeWarning, string(v1.PodReasonUnschedulable), message) + // The reason field in 'Events' should be "FailedScheduling", there is not constants defined for this in + // k8s core, so using the same string here. + // The reason field in PodCondition should be "Unschedulable" + sc.Recorder.Eventf(pod, v1.EventTypeWarning, "FailedScheduling", message) if _, err := sc.StatusUpdater.UpdatePodCondition(pod, &v1.PodCondition{ Type: v1.PodScheduled, Status: v1.ConditionFalse, diff --git a/vendor/github.com/kubernetes-sigs/kube-batch/pkg/scheduler/cache/event_handlers.go b/vendor/github.com/kubernetes-sigs/kube-batch/pkg/scheduler/cache/event_handlers.go index 4260521fdc5..3b005a2fee3 100644 --- a/vendor/github.com/kubernetes-sigs/kube-batch/pkg/scheduler/cache/event_handlers.go +++ b/vendor/github.com/kubernetes-sigs/kube-batch/pkg/scheduler/cache/event_handlers.go @@ -18,7 +18,6 @@ package cache import ( "fmt" - "reflect" "github.com/golang/glog" @@ -269,19 +268,10 @@ func (sc *SchedulerCache) addNode(node *v1.Node) error { return nil } -func isNodeInfoUpdated(oldNode, newNode *v1.Node) bool { - return !reflect.DeepEqual(oldNode.Status.Allocatable, newNode.Status.Allocatable) || - !reflect.DeepEqual(oldNode.Spec.Taints, newNode.Spec.Taints) || - !reflect.DeepEqual(oldNode.Labels, newNode.Labels) || - !reflect.DeepEqual(oldNode.Spec.Unschedulable, newNode.Spec.Unschedulable) -} - // Assumes that lock is already acquired. func (sc *SchedulerCache) updateNode(oldNode, newNode *v1.Node) error { if sc.Nodes[newNode.Name] != nil { - if isNodeInfoUpdated(oldNode, newNode) { - sc.Nodes[newNode.Name].SetNode(newNode) - } + sc.Nodes[newNode.Name].SetNode(newNode) return nil }