From 44779e56cb63041a2ef9d2885fc9c47262702e21 Mon Sep 17 00:00:00 2001
From: Dmitry Shulyak <yashulyak@gmail.com>
Date: Thu, 20 Apr 2017 14:25:46 +0300
Subject: [PATCH] Verify that --use-rudder works correctly

---
 helm_client.go | 14 ++++++++------
 utils.go       |  6 ++++--
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/helm_client.go b/helm_client.go
index 938fb82b5..ab535a876 100644
--- a/helm_client.go
+++ b/helm_client.go
@@ -34,8 +34,8 @@ import (
 )
 
 const (
-	experimentalTillerImage string = "nebril/tiller-experimental"
-	rudderAppcontroller     string = "rudderAppcontroller"
+	experimentalTillerImage string = "nebril/tiller"
+	rudderAppcontroller     string = "rudder"
 )
 
 // HelmManager provides functionality to install client/server helm and use it
@@ -76,7 +76,8 @@ func (m *BinaryHelmManager) InstallTiller() error {
 	By("Waiting for tiller pod")
 	waitTillerPod(m.Clientset, m.Namespace)
 	if enableRudder {
-		return prepareRudder(m.Clientset, m.Namespace)
+		By("Enabling rudder pod")
+		prepareRudder(m.Clientset, m.Namespace)
 	}
 	return nil
 }
@@ -183,7 +184,7 @@ func regexpKeyFromStructuredOutput(key, output string) string {
 	return result[1]
 }
 
-func prepareRudder(clientset kubernetes.Interface, namespace string) error {
+func prepareRudder(clientset kubernetes.Interface, namespace string) {
 	rudder := &v1.Pod{
 		ObjectMeta: v1.ObjectMeta{
 			Name: rudderAppcontroller,
@@ -193,14 +194,15 @@ func prepareRudder(clientset kubernetes.Interface, namespace string) error {
 			Containers: []v1.Container{
 				{
 					Name:            "rudder-appcontroller",
-					Image:           "mirantis/k8s-appcontroller",
+					Image:           "mirantis/rudder-appcontroller",
 					ImagePullPolicy: v1.PullNever,
 				},
 			},
 		},
 	}
 	_, err := clientset.Core().Pods(namespace).Create(rudder)
-	return err
+	Expect(err).NotTo(HaveOccurred())
+	WaitForPod(clientset, namespace, rudderAppcontroller, v1.PodRunning)
 }
 
 func deleteRudder(clientset kubernetes.Interface, namespace string) error {
diff --git a/utils.go b/utils.go
index 79ac91383..850b16974 100644
--- a/utils.go
+++ b/utils.go
@@ -21,13 +21,15 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
+	"time"
+
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/pkg/api/v1"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 )
 
-// TODO move this variables under single object
+// TODO move this variables under single object TestContext
 var url string
 var enableRudder bool
 
@@ -75,6 +77,6 @@ func WaitForPod(clientset kubernetes.Interface, namespace string, name string, p
 			return fmt.Errorf("pod %v is not %v phase: %v", podUpdated.Name, phase, podUpdated.Status.Phase)
 		}
 		return nil
-	}).Should(BeNil())
+	}, 1*time.Minute, 3*time.Second).Should(BeNil())
 	return podUpdated
 }