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

place damonset pods on not ready nodes

pull/6/head
Mike Danese 2016-02-10 15:38:27 -08:00
parent b3bc741d0d
commit 23ad84b0c7
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/controller/daemon/controller.go
View File

@ -582,11 +582,6 @@ func (dsc *DaemonSetsController) nodeShouldRunDaemonPod(node *api.Node, ds *exte
if !(ds.Spec.Template.Spec.NodeName == "" || ds.Spec.Template.Spec.NodeName == node.Name) { if !(ds.Spec.Template.Spec.NodeName == "" || ds.Spec.Template.Spec.NodeName == node.Name) {
return false return false
} }
// If the node is not ready, don't run on it.
// TODO(mikedanese): remove this once daemonpods forgive nodes
if !api.IsNodeReady(node) {
return false
}
for _, c := range node.Status.Conditions { for _, c := range node.Status.Conditions {
if c.Type == api.NodeOutOfDisk && c.Status == api.ConditionTrue { if c.Type == api.NodeOutOfDisk && c.Status == api.ConditionTrue {

4
pkg/controller/daemon/controller_test.go
View File

@ -187,7 +187,7 @@ func TestOneNodeDaemonLaunchesPod(t *testing.T) {
syncAndValidateDaemonSets(t, manager, ds, podControl, 1, 0) syncAndValidateDaemonSets(t, manager, ds, podControl, 1, 0)
} }
// DaemonSets should not place onto NotReady nodes // DaemonSets should place onto NotReady nodes
func TestNotReadNodeDaemonDoesNotLaunchPod(t *testing.T) { func TestNotReadNodeDaemonDoesNotLaunchPod(t *testing.T) {
manager, podControl := newTestController() manager, podControl := newTestController()
node := newNode("not-ready", nil) node := newNode("not-ready", nil)
@ -199,7 +199,7 @@ func TestNotReadNodeDaemonDoesNotLaunchPod(t *testing.T) {
manager.nodeStore.Add(node) manager.nodeStore.Add(node)
ds := newDaemonSet("foo") ds := newDaemonSet("foo")
manager.dsStore.Add(ds) manager.dsStore.Add(ds)
syncAndValidateDaemonSets(t, manager, ds, podControl, 0, 0) syncAndValidateDaemonSets(t, manager, ds, podControl, 1, 0)
} }
// DaemonSets should not place onto OutOfDisk nodes // DaemonSets should not place onto OutOfDisk nodes