github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #31907 from kubernetes/revert-31020-ds-taint

Browse Source 
Automatic merge from submit-queue

Revert "daemonset controller should respect taints"

Reverts kubernetes/kubernetes#31020

We will be unreverting with some modifications after v1.4.

cc @pwittrock @davidopp
This commit is contained in:
Kubernetes Submit Queue 2016-09-01 20:32:17 -07:00 committed by GitHub
commit 9be47a2c55
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)
}