simplify DaemonReaper by using NodeSelector

nikhiljindal · Oct 9, 2015 · 6fe7edc · 6fe7edc
1 parent 2192946
commit 6fe7edc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 23 deletions.
diff --git a/docs/design/daemon.md b/docs/design/daemon.md
@@ -97,7 +97,7 @@ The DaemonSet supports standard API features:
     - get (e.g. kubectl get daemonsets)
     - describe
   - Modifiers
-    - delete (if --cascade=true, then first the client turns down all the pods controlled by the DaemonSet (by setting the nodeName to a non-existant name); then it deletes the DaemonSet; then it deletes the pods)
+    - delete (if --cascade=true, then first the client turns down all the pods controlled by the DaemonSet (by setting the nodeSelector to a uuid pair that is unlikely to be set on any node); then it deletes the DaemonSet; then it deletes the pods)
     - label
 	- annotate
     - update operations like patch and replace (only allowed to selector and to nodeSelector and nodeName of pod template)

diff --git a/pkg/kubectl/stop.go b/pkg/kubectl/stop.go
@@ -21,12 +21,11 @@ import (
 	"strings"
 	"time"
 
-	fuzz "github.com/google/gofuzz"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/meta"
 	client "k8s.io/kubernetes/pkg/client/unversioned"
-	"k8s.io/kubernetes/pkg/fields"
 	"k8s.io/kubernetes/pkg/labels"
+	"k8s.io/kubernetes/pkg/util"
 	"k8s.io/kubernetes/pkg/util/wait"
 )
 
@@ -188,27 +187,13 @@ func (reaper *DaemonSetReaper) Stop(namespace, name string, timeout time.Duratio
 		return "", err
 	}
 
-	// Update the daemon set to select for a non-existent NodeName.
-	// The daemon set controller will then kill all the daemon pods corresponding to daemon set.
-	nodes, err := reaper.Nodes().List(labels.Everything(), fields.Everything())
-	if err != nil {
-		return "", err
-	}
-	var fuzzer = fuzz.New()
-	var nameExists bool
-
-	var nodeName string
-	fuzzer.Fuzz(&nodeName)
-	nameExists = false
-	for _, node := range nodes.Items {
-		nameExists = nameExists || node.Name == nodeName
-	}
-	if nameExists {
-		// Probability of reaching here is extremely low, most likely indicates a programming bug/library error.
-		return "", fmt.Errorf("Name collision generating an unused node name. Please retry this operation.")
+	// We set the nodeSelector to a random label. This label is nearly guaranteed
+	// to not be set on any node so the DameonSetController will start deleting
+	// daemon pods. Once it's done deleting the daemon pods, it's safe to delete
+	// the DaemonSet.
+	ds.Spec.Template.Spec.NodeSelector = map[string]string{
+		string(util.NewUUID()): string(util.NewUUID()),
 	}
-
-	ds.Spec.Template.Spec.NodeName = nodeName
 	// force update to avoid version conflict
 	ds.ResourceVersion = ""