Merge pull request #21639 from jayunit100/cassandra-example-fix

Fix broken cassandra test: Up to date containers + RC of 2 nodes with…

examples/cassandra/README.md

@@ -196,7 +196,9 @@ metadata:
     app: cassandra
   name: cassandra
 spec:
-  replicas: 1
+  replicas: 2
+  selector:
+      app: cassandra
   template:
     metadata:
       labels:

examples/cassandra/cassandra-controller.yaml

@@ -5,7 +5,9 @@ metadata:
     app: cassandra
   name: cassandra
 spec:
-  replicas: 1
+  replicas: 2
+  selector:
+      app: cassandra
   template:
     metadata:
       labels:

test/e2e/examples.go

@@ -210,31 +210,36 @@ var _ = Describe("[Feature:Example]", func() {
 			controllerYaml := mkpath("cassandra-controller.yaml")
 			nsFlag := fmt.Sprintf("--namespace=%v", ns)
 
-			By("starting service and pod")
+			By("Starting the cassandra service and pod")
 			runKubectlOrDie("create", "-f", serviceYaml, nsFlag)
 			runKubectlOrDie("create", "-f", podYaml, nsFlag)
+
+			Logf("waiting for first cassandra pod")
 			err := waitForPodRunningInNamespace(c, "cassandra", ns)
 			Expect(err).NotTo(HaveOccurred())
 
+			Logf("waiting for thrift listener online")
 			_, err = lookForStringInLog(ns, "cassandra", "cassandra", "Listening for thrift clients", serverStartTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
+			Logf("wait for service")
 			err = waitForEndpoint(c, ns, "cassandra")
 			Expect(err).NotTo(HaveOccurred())
 
-			By("create and scale rc")
+			// Create an RC with n nodes in it.  Each node will then be verified.
+			By("Creating a Cassandra RC")
 			runKubectlOrDie("create", "-f", controllerYaml, nsFlag)
-			err = ScaleRC(c, ns, "cassandra", 2, true)
-			Expect(err).NotTo(HaveOccurred())
-			forEachPod(c, ns, "name", "cassandra", func(pod api.Pod) {
+			forEachPod(c, ns, "app", "cassandra", func(pod api.Pod) {
+				Logf("Verifying pod %v ", pod.Name)
 				_, err = lookForStringInLog(ns, pod.Name, "cassandra", "Listening for thrift clients", serverStartTimeout)
 				Expect(err).NotTo(HaveOccurred())
 				_, err = lookForStringInLog(ns, pod.Name, "cassandra", "Handshaking version", serverStartTimeout)
 				Expect(err).NotTo(HaveOccurred())
 			})
 
+			By("Finding each node in the nodetool status lines")
 			output := runKubectlOrDie("exec", "cassandra", nsFlag, "--", "nodetool", "status")
-			forEachPod(c, ns, "name", "cassandra", func(pod api.Pod) {
+			forEachPod(c, ns, "app", "cassandra", func(pod api.Pod) {
 				if !strings.Contains(output, pod.Status.PodIP) {
 					Failf("Pod ip %s not found in nodetool status", pod.Status.PodIP)
 				}