Sort labels and taints

This avoids, flappy tests, and flappy diffs
errm · Nov 21, 2018 · f88d66d · f88d66d
1 parent 67293a9
commit f88d66d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/pkg/node/node.go b/pkg/node/node.go
@@ -25,6 +25,7 @@ import (
 	"fmt"
 	"log"
 	"regexp"
+	"sort"
 	"time"
 )
 
@@ -110,6 +111,7 @@ func (n *Node) Labels() []string {
 	for key, value := range labels {
 		l = append(l, key+"="+value)
 	}
+	sort.Strings(l)
 	return l
 }
 
@@ -132,6 +134,7 @@ func (n *Node) Taints() []string {
 			taints = append(taints, matches[1]+"="+*t.Value)
 		}
 	}
+	sort.Strings(taints)
 	return taints
 }
 

diff --git a/pkg/system/system_test.go b/pkg/system/system_test.go
@@ -202,7 +202,7 @@ func TestConfigureLabels(t *testing.T) {
 	}
 
 	expected := `[Service]
-Environment='KUBELET_NODE_LABELS=--node-labels="node-role.kubernetes.io/worker=true,gpu-type=K80"'
+Environment='KUBELET_NODE_LABELS=--node-labels="gpu-type=K80,node-role.kubernetes.io/worker=true"'
 `
 	fs.Check(t, "/etc/systemd/system/kubelet.service.d/40-labels.conf", expected, 0640)
 }