Fix helm install and add tiller test

Author: dkoshkin

integration/heapster.go integration/addons.go

@@ -39,6 +39,18 @@ func verifyHeapster(master NodeDeets, sshKey string) error {
 		"heapster":          3,
 		"heapster-influxdb": 1,
 	}
+	return verifyDeployment(deployments, master, sshKey)
+}
+
+func verifyTiller(master NodeDeets, sshKey string) error {
+	// verify pods are up
+	deployments := map[string]int{
+		"tiller-deploy": 1,
+	}
+	return verifyDeployment(deployments, master, sshKey)
+}
+
+func verifyDeployment(deployments map[string]int, master NodeDeets, sshKey string) error {
 	for k, v := range deployments {
 		if err := retry.WithBackoff(func() error {
 			return runViaSSH([]string{fmt.Sprintf("sudo kubectl get deployment %s -n kube-system -o jsonpath='{.status.availableReplicas}' | grep %d", k, v)}, []NodeDeets{master}, sshKey, 1*time.Minute)

integration/install_test.go

@@ -157,12 +157,32 @@ var _ = Describe("kismatic", func() {
 			})
 		})
 
+		Context("when deploying an HA cluster", func() {
+			ItOnAWS("should still be a highly available cluster after removing a master node [slow]", func(aws infrastructureProvisioner) {
+				WithInfrastructureAndDNS(NodeCount{1, 2, 1, 0, 0}, Ubuntu1604LTS, aws, func(nodes provisionedNodes, sshKey string) {
+					// install cluster
+					installOpts := installOptions{allowPackageInstallation: true}
+					err := installKismatic(nodes, installOpts, sshKey)
+					Expect(err).ToNot(HaveOccurred())
+
+					By("Removing a Kubernetes master node")
+					if err = aws.TerminateNode(nodes.master[0]); err != nil {
+						FailIfError(err, "could not remove node")
+					}
+					By("Re-running Kuberang")
+					if err = runViaSSH([]string{"sudo kuberang"}, []NodeDeets{nodes.master[1]}, sshKey, 5*time.Minute); err != nil {
+						FailIfError(err, "kuberang error")
+					}
+				})
+			})
+		})
+
 		// This spec will be used for testing non-destructive kismatic features on
 		// a new cluster.
 		// This spec is open to modification when new assertions have to be made
 		Context("when deploying a skunkworks cluster", func() {
 			ItOnAWS("should install successfully [slow]", func(aws infrastructureProvisioner) {
-				WithInfrastructureAndDNS(NodeCount{3, 2, 3, 2, 2}, Ubuntu1604LTS, aws, func(nodes provisionedNodes, sshKey string) {
+				WithInfrastructure(NodeCount{3, 2, 3, 2, 2}, Ubuntu1604LTS, aws, func(nodes provisionedNodes, sshKey string) {
 					// reserve one of the workers for the add-worker test
 					allWorkers := nodes.worker
 					nodes.worker = allWorkers[0 : len(nodes.worker)-1]
@@ -206,17 +226,8 @@ var _ = Describe("kismatic", func() {
 						return verifyHeapster(nodes.master[0], sshKey)
 					})
 
-					// This test should always be last
-					sub.It("should still be a highly available cluster after removing a master node", func() error {
-						By("Removing a Kubernetes master node")
-						if err = aws.TerminateNode(nodes.master[0]); err != nil {
-							return fmt.Errorf("could not remove node: %v", err)
-						}
-						By("Re-running Kuberang")
-						if err = runViaSSH([]string{"sudo kuberang"}, []NodeDeets{nodes.master[1]}, sshKey, 5*time.Minute); err != nil {
-							return err
-						}
-						return nil
+					sub.It("should have tiller running", func() error {
+						return verifyTiller(nodes.master[0], sshKey)
 					})
 				})
 			})

pkg/install/execute.go

@@ -771,6 +771,7 @@ func (ae *ansibleExecutor) buildClusterCatalog(p *Plan) (*ansible.ClusterCatalog
 		// Currently only helm is supported
 		switch p.AddOns.PackageManager.Provider {
 		case "helm":
+			cc.Helm.Enabled = true
 		default:
 			cc.Helm.Enabled = true
 		}