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

Revert "daemonset controller should respect taints"

pull/6/head
Mike Danese 2016-09-01 12:54:16 -07:00 committed by GitHub
parent e81b3fd340
commit a615c426a5
2 changed files with 0 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/controller/daemon/daemoncontroller.go
View File

@ -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
}

28
pkg/controller/daemon/daemoncontroller_test.go
View File

@ -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)
}