Add node label integration test

Author: dkoshkin

integration/add_worker.go

@@ -9,9 +9,12 @@ import (
 	. "github.com/onsi/ginkgo"
 )
 
-func addWorkerToCluster(newWorker NodeDeets, sshKey string) error {
+func addWorkerToCluster(newWorker NodeDeets, sshKey string, labels []string) error {
 	By("Adding new worker")
 	cmd := exec.Command("./kismatic", "install", "add-worker", "-f", "kismatic-testing.yaml", newWorker.Hostname, newWorker.PublicIP, newWorker.PrivateIP)
+	if len(labels) > 0 {
+		cmd.Args = append(cmd.Args, "--labels", strings.Join(labels, ","))
+	}
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 	if err := cmd.Run(); err != nil {

integration/hosts_file_test.go

@@ -51,7 +51,7 @@ var _ = Describe("hosts file modification feature", func() {
 				FailIfError(err)
 
 				By("Adding a worker with a bogus hostname that is added to hosts files")
-				err = addWorkerToCluster(nodes.worker[3], sshKey)
+				err = addWorkerToCluster(nodes.worker[3], sshKey, []string{})
 				FailIfError(err)
 			})
 		})

integration/install_test.go

@@ -234,7 +234,7 @@ var _ = Describe("kismatic", func() {
 
 						sub.It("should allow adding a worker node", func() error {
 							newWorker := allWorkers[len(allWorkers)-1]
-							return addWorkerToCluster(newWorker, sshKey)
+							return addWorkerToCluster(newWorker, sshKey, []string{"com.integrationtest/worker=true"})
 						})
 
 						sub.It("should be able to deploy a workload with ingress", func() error {
@@ -257,6 +257,10 @@ var _ = Describe("kismatic", func() {
 						sub.It("should have tiller running", func() error {
 							return verifyTiller(nodes.master[0], sshKey)
 						})
+
+						sub.It("nodes should contain expected labels", func() error {
+							return containsLabels(nodes, sshKey)
+						})
 					})
 				})
 			})
@@ -284,7 +288,7 @@ var _ = Describe("kismatic", func() {
 
 						sub.It("should allow adding a worker node", func() error {
 							newWorker := allWorkers[len(allWorkers)-1]
-							return addWorkerToCluster(newWorker, sshKey)
+							return addWorkerToCluster(newWorker, sshKey, []string{"com.integrationtest/worker=true"})
 						})
 
 						sub.It("should be able to deploy a workload with ingress", func() error {
@@ -307,6 +311,10 @@ var _ = Describe("kismatic", func() {
 						sub.It("should have tiller running", func() error {
 							return verifyTiller(nodes.master[0], sshKey)
 						})
+
+						sub.It("nodes should contain expected labels", func() error {
+							return containsLabels(nodes, sshKey)
+						})
 					})
 				})
 			})
@@ -334,7 +342,7 @@ var _ = Describe("kismatic", func() {
 
 		// 				sub.It("should allow adding a worker node", func() error {
 		// 					newWorker := allWorkers[len(allWorkers)-1]
-		// 					return addWorkerToCluster(newWorker, sshKey)
+		// 					return addWorkerToCluster(newWorker, sshKey, []string{})
 		// 				})
 
 		// 				// This test is flaky with contiv

integration/labels.go

@@ -0,0 +1,40 @@
+package integration
+
+import (
+	"fmt"
+	"time"
+)
+
+func containsLabels(nodes provisionedNodes, sshKey string) error {
+	// labels were hardcoded in th plan pattern
+	tests := []struct {
+		nodes []NodeDeets
+		label string
+	}{
+		{
+			nodes: nodes.master,
+			label: "com.integrationtest/master:true",
+		},
+		{
+			nodes: nodes.worker,
+			label: "com.integrationtest/worker:true",
+		},
+		{
+			nodes: nodes.ingress,
+			label: "com.integrationtest/ingress:true",
+		},
+		{
+			nodes: nodes.storage,
+			label: "com.integrationtest/storage:true",
+		},
+	}
+	for _, role := range tests {
+		for _, n := range role.nodes {
+			if err := runViaSSH([]string{fmt.Sprintf("sudo kubectl get nodes %s -o jsonpath='{.metadata.labels}' | grep %q", n.Hostname, role.label)}, []NodeDeets{nodes.master[0]}, sshKey, 1*time.Minute); err != nil {
+				return fmt.Errorf("error validating node %q label: %v", n.Hostname, err)
+			}
+		}
+	}
+
+	return nil
+}

integration/plan_patterns.go

@@ -108,27 +108,35 @@ master:
   nodes:{{range .Master}}
   - host: {{.Hostname}}
     ip: {{.PublicIP}}
-    internalip: {{.PrivateIP}}{{end}}
+    internalip: {{.PrivateIP}}
+    labels:
+      com.integrationtest/master: true{{end}}
   load_balanced_fqdn: {{.MasterNodeFQDN}}
   load_balanced_short_name: {{.MasterNodeShortName}}
 worker:
   expected_count: {{len .Worker}}
   nodes:{{range .Worker}}
   - host: {{.Hostname}}
     ip: {{.PublicIP}}
-    internalip: {{.PrivateIP}}{{end}}
+    internalip: {{.PrivateIP}}
+    labels:
+      com.integrationtest/worker: true{{end}}
 ingress:
   expected_count: {{len .Ingress}}
   nodes:{{range .Ingress}}
   - host: {{.Hostname}}
     ip: {{.PublicIP}}
-    internalip: {{.PrivateIP}}{{end}}
+    internalip: {{.PrivateIP}}
+    labels:
+      com.integrationtest/ingress: true{{end}}
 storage:
   expected_count: {{len .Storage}}
   nodes:{{range .Storage}}
   - host: {{.Hostname}}
     ip: {{.PublicIP}}
-    internalip: {{.PrivateIP}}{{end}}
+    internalip: {{.PrivateIP}}
+    labels:
+      com.integrationtest/storage: true{{end}}
 nfs:
   nfs_volume:{{range .NFSVolume}}
   - nfs_host: {{.Host}}

integration/upgrade_test.go

@@ -64,7 +64,7 @@ var _ = Describe("Upgrade", func() {
 
 						sub.It("should allow adding a worker node", func() error {
 							newWorker := allWorkers[len(allWorkers)-1]
-							return addWorkerToCluster(newWorker, sshKey)
+							return addWorkerToCluster(newWorker, sshKey, []string{})
 						})
 
 						sub.It("should be able to deploy a workload with ingress", func() error {
@@ -248,7 +248,7 @@ var _ = Describe("Upgrade", func() {
 
 						sub.It("should allow adding a worker node", func() error {
 							newWorker := allWorkers[len(allWorkers)-1]
-							return addWorkerToCluster(newWorker, sshKey)
+							return addWorkerToCluster(newWorker, sshKey, []string{})
 						})
 
 						sub.It("should be able to deploy a workload with ingress", func() error {