From a615c426a51b622b6ca937c4c905c2709c5998ad Mon Sep 17 00:00:00 2001 From: Mike Danese Date: Thu, 1 Sep 2016 12:54:16 -0700 Subject: [PATCH] Revert "daemonset controller should respect taints" --- pkg/controller/daemon/daemoncontroller.go | 10 ------- .../daemon/daemoncontroller_test.go | 28 ------------------- 2 files changed, 38 deletions(-) diff --git a/pkg/controller/daemon/daemoncontroller.go b/pkg/controller/daemon/daemoncontroller.go index 4f95703b2cb..1718fe46804 100644 --- a/pkg/controller/daemon/daemoncontroller.go +++ b/pkg/controller/daemon/daemoncontroller.go @@ -713,16 +713,6 @@ func (dsc *DaemonSetsController) nodeShouldRunDaemonPod(node *api.Node, ds *exte for _, r := range reasons { glog.V(2).Infof("GeneralPredicates failed on pod %s for reason: %v", newPod.Name, r.GetReason()) } - if !fit { - return false - } - fit, reasons, err = predicates.PodToleratesNodeTaints(newPod, predicates.PredicateMetadata(newPod, nil), nodeInfo) - if err != nil { - glog.Warningf("PodToleratesNodeTaints failed on pod %s due to unexpected error: %v", newPod.Name, err) - } - for _, r := range reasons { - glog.V(2).Infof("PodToleratesNodeTaints failed on pod %s for reason: %v", newPod.Name, r.GetReason()) - } return fit } diff --git a/pkg/controller/daemon/daemoncontroller_test.go b/pkg/controller/daemon/daemoncontroller_test.go index ae641ab53d2..eec7dbe5c86 100644 --- a/pkg/controller/daemon/daemoncontroller_test.go +++ b/pkg/controller/daemon/daemoncontroller_test.go @@ -583,31 +583,3 @@ func TestNodeAffinityDaemonLaunchesPods(t *testing.T) { manager.dsStore.Add(daemon) syncAndValidateDaemonSets(t, manager, daemon, podControl, 3, 0) } - -func TestNodeTaintDaemonDoesntLaunchIntolerantPods(t *testing.T) { - manager, podControl := newTestController() - node := newNode("", nil) - node.ObjectMeta.Annotations = map[string]string{ - api.TaintsAnnotationKey: `[{"key":"dedictated","value":"master","effect":"NoSchedule"}]`, - } - manager.nodeStore.Store.Add(node) - daemon := newDaemonSet("foo") - manager.dsStore.Add(daemon) - syncAndValidateDaemonSets(t, manager, daemon, podControl, 0, 0) -} - -func TestNodeTaintDaemonLaunchesTolerantPods(t *testing.T) { - manager, podControl := newTestController() - node := newNode("", nil) - node.ObjectMeta.Annotations = map[string]string{ - api.TaintsAnnotationKey: `[{"key":"dedictated","value":"master","effect":"NoSchedule"}]`, - } - manager.nodeStore.Store.Add(node) - daemon := newDaemonSet("foo") - daemon.Spec.Template.ObjectMeta.Annotations = map[string]string{ - api.TolerationsAnnotationKey: `[{"key":"dedictated","operator":"Equal","value":"master"}]`, - } - - manager.dsStore.Add(daemon) - syncAndValidateDaemonSets(t, manager, daemon, podControl, 1, 0) -}