From 14d986366580413bc17d6cc13bcaf7bb20a4c5ef Mon Sep 17 00:00:00 2001
From: Janet Kuo <chiachenk@google.com>
Date: Fri, 17 Jun 2016 16:10:58 -0700
Subject: [PATCH] Fix broken redis example e2e tests

---
 examples/redis/redis-controller.yaml          |  2 +-
 examples/redis/redis-master.yaml              |  4 ++--
 examples/redis/redis-sentinel-controller.yaml |  2 +-
 test/e2e/examples.go                          | 14 +++++++++++---
 test/e2e/framework/util.go                    |  2 +-
 5 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/examples/redis/redis-controller.yaml b/examples/redis/redis-controller.yaml
index 3e1dc6177d2..39bed21cb8f 100644
--- a/examples/redis/redis-controller.yaml
+++ b/examples/redis/redis-controller.yaml
@@ -13,7 +13,7 @@ spec:
     spec:
       containers:
       - name: redis
-        image: kubernetes/redis:v2
+        image: kubernetes/redis:v1
         ports:
         - containerPort: 6379
         resources:
diff --git a/examples/redis/redis-master.yaml b/examples/redis/redis-master.yaml
index 315d77f9741..f43d8aea826 100644
--- a/examples/redis/redis-master.yaml
+++ b/examples/redis/redis-master.yaml
@@ -9,7 +9,7 @@ metadata:
 spec:
   containers:
     - name: master
-      image: kubernetes/redis:v2
+      image: kubernetes/redis:v1
       env:
         - name: MASTER
           value: "true"
@@ -22,7 +22,7 @@ spec:
         - mountPath: /redis-master-data
           name: data
     - name: sentinel
-      image: kubernetes/redis:v2
+      image: kubernetes/redis:v1
       env:
         - name: SENTINEL
           value: "true"
diff --git a/examples/redis/redis-sentinel-controller.yaml b/examples/redis/redis-sentinel-controller.yaml
index 623323d98a0..c82ae56c285 100644
--- a/examples/redis/redis-sentinel-controller.yaml
+++ b/examples/redis/redis-sentinel-controller.yaml
@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: sentinel
-        image: kubernetes/redis:v2
+        image: kubernetes/redis:v1
         env:
           - name: SENTINEL
             value: "true"
diff --git a/test/e2e/examples.go b/test/e2e/examples.go
index 03010caa942..f9ad7591666 100644
--- a/test/e2e/examples.go
+++ b/test/e2e/examples.go
@@ -91,7 +91,7 @@ var _ = framework.KubeDescribe("[Feature:Example]", func() {
 			framework.RunKubectlOrDie("create", "-f", sentinelServiceYaml, nsFlag)
 			framework.RunKubectlOrDie("create", "-f", sentinelControllerYaml, nsFlag)
 			framework.RunKubectlOrDie("create", "-f", controllerYaml, nsFlag)
-			label := labels.SelectorFromSet(labels.Set(map[string]string{"name": sentinelRC}))
+			label := labels.SelectorFromSet(labels.Set(map[string]string{sentinelRC: "true"}))
 			err = framework.WaitForPodsWithLabelRunning(c, ns, label)
 			Expect(err).NotTo(HaveOccurred())
 			label = labels.SelectorFromSet(labels.Set(map[string]string{"name": redisRC}))
@@ -106,13 +106,21 @@ var _ = framework.KubeDescribe("[Feature:Example]", func() {
 
 			By("checking up the services")
 			checkAllLogs := func() {
-				forEachPod("name", "redis", func(pod api.Pod) {
+				selectorKey, selectorValue := "name", redisRC
+				label := labels.SelectorFromSet(labels.Set(map[string]string{selectorKey: selectorValue}))
+				err = framework.WaitForPodsWithLabelRunning(c, ns, label)
+				Expect(err).NotTo(HaveOccurred())
+				forEachPod(selectorKey, selectorValue, func(pod api.Pod) {
 					if pod.Name != bootstrapPodName {
 						_, err := framework.LookForStringInLog(ns, pod.Name, "redis", expectedOnServer, serverStartTimeout)
 						Expect(err).NotTo(HaveOccurred())
 					}
 				})
-				forEachPod("name", "redis-sentinel", func(pod api.Pod) {
+				selectorKey, selectorValue = sentinelRC, "true"
+				label = labels.SelectorFromSet(labels.Set(map[string]string{selectorKey: selectorValue}))
+				err = framework.WaitForPodsWithLabelRunning(c, ns, label)
+				Expect(err).NotTo(HaveOccurred())
+				forEachPod(selectorKey, selectorValue, func(pod api.Pod) {
 					if pod.Name != bootstrapPodName {
 						_, err := framework.LookForStringInLog(ns, pod.Name, "sentinel", expectedOnSentinel, serverStartTimeout)
 						Expect(err).NotTo(HaveOccurred())
diff --git a/test/e2e/framework/util.go b/test/e2e/framework/util.go
index 2694cc02534..3228745e283 100644
--- a/test/e2e/framework/util.go
+++ b/test/e2e/framework/util.go
@@ -3913,7 +3913,7 @@ func WaitForIngressAddress(c *client.Client, ns, ingName string, timeout time.Du
 // Looks for the given string in the log of a specific pod container
 func LookForStringInLog(ns, podName, container, expectedString string, timeout time.Duration) (result string, err error) {
 	return LookForString(expectedString, timeout, func() string {
-		return RunKubectlOrDie("log", podName, container, fmt.Sprintf("--namespace=%v", ns))
+		return RunKubectlOrDie("logs", podName, container, fmt.Sprintf("--namespace=%v", ns))
 	})
 }