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

Merge pull request #25741 from fgrzadkowski/unschedulable_pod 

Stop setting Message when updating PodScheduled condition
pull/6/head
Filip Grzadkowski 2016-05-20 10:02:13 +02:00
parent 0bc2f47ac8 9cba3fc5ae
commit ab10484330
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugin/pkg/scheduler/scheduler.go
View File

@ -101,10 +101,9 @@ func (s *Scheduler) scheduleOne() {
s.config.Error(pod, err)
s.config.Recorder.Eventf(pod, api.EventTypeWarning, "FailedScheduling", "%v", err)
s.config.PodConditionUpdater.Update(pod, &api.PodCondition{
Type: api.PodScheduled,
Status: api.ConditionFalse,
Reason: "Unschedulable",
Message: err.Error(),
Type: api.PodScheduled,
Status: api.ConditionFalse,
Reason: "Unschedulable",
})
return
}
@ -142,10 +141,9 @@ func (s *Scheduler) scheduleOne() {
s.config.Error(pod, err)
s.config.Recorder.Eventf(pod, api.EventTypeNormal, "FailedScheduling", "Binding rejected: %v", err)
s.config.PodConditionUpdater.Update(pod, &api.PodCondition{
Type: api.PodScheduled,
Status: api.ConditionFalse,
Reason: "BindingRejected",
Message: err.Error(),
Type: api.PodScheduled,
Status: api.ConditionFalse,
Reason: "BindingRejected",
})
return
}