From 55199a04bebe9265909f4d662f50f7694a24bbfb Mon Sep 17 00:00:00 2001 From: "Da K. Ma" Date: Tue, 11 Sep 2018 09:14:07 +0800 Subject: [PATCH] Added default tolerations for new pods. Signed-off-by: Da K. Ma --- pkg/controller/daemon/daemon_controller.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/controller/daemon/daemon_controller.go b/pkg/controller/daemon/daemon_controller.go index 32bab2ba3a2..d9840830271 100644 --- a/pkg/controller/daemon/daemon_controller.go +++ b/pkg/controller/daemon/daemon_controller.go @@ -1287,8 +1287,6 @@ func (dsc *DaemonSetsController) syncDaemonSet(key string) error { } func (dsc *DaemonSetsController) simulate(newPod *v1.Pod, node *v1.Node, ds *apps.DaemonSet) ([]algorithm.PredicateFailureReason, *schedulercache.NodeInfo, error) { - util.AddOrUpdateDaemonPodTolerations(&newPod.Spec, kubelettypes.IsCriticalPod(newPod)) - objects, err := dsc.podNodeIndex.ByIndex("nodeName", node.Name) if err != nil { return nil, nil, err @@ -1418,6 +1416,10 @@ func NewPod(ds *apps.DaemonSet, nodeName string) *v1.Pod { newPod := &v1.Pod{Spec: ds.Spec.Template.Spec, ObjectMeta: ds.Spec.Template.ObjectMeta} newPod.Namespace = ds.Namespace newPod.Spec.NodeName = nodeName + + // Added default tolerations for DaemonSet pods. + util.AddOrUpdateDaemonPodTolerations(&newPod.Spec, kubelettypes.IsCriticalPod(newPod)) + return newPod }