Merge pull request kubernetes#25741 from fgrzadkowski/unschedulable_pod

Stop setting Message when updating PodScheduled condition
tnachen · May 20, 2016 · ab10484 · ab10484
2 parents 0bc2f47 + 9cba3fc
commit ab10484
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/plugin/pkg/scheduler/scheduler.go b/plugin/pkg/scheduler/scheduler.go
@@ -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
 		}