fix(k8s): wait for Tiller pod to be ready when initializing

Fixes #228
garden-io · Aug 14, 2018 · a5cd8eb · a5cd8eb
1 parent 1dc936e
commit a5cd8eb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/garden-cli/src/plugins/kubernetes/helm.ts b/garden-cli/src/plugins/kubernetes/helm.ts
@@ -251,7 +251,7 @@ async function buildModule({ ctx, provider, module, logEntry }: BuildModuleParam
   return { fresh: true }
 }
 
-function helm(provider: KubernetesProvider, ...args: string[]) {
+export function helm(provider: KubernetesProvider, ...args: string[]) {
   return execa.stdout("helm", [
     "--kube-context", provider.config.context,
     ...args,

diff --git a/garden-cli/src/plugins/kubernetes/local.ts b/garden-cli/src/plugins/kubernetes/local.ts
@@ -43,6 +43,7 @@ import { readFile } from "fs-extra"
 import { processServices } from "../../process"
 import { LogEntry } from "../../logger/logger"
 import { homedir } from "os"
+import { helm } from "./helm"
 
 // TODO: split this into separate plugins to handle Docker for Mac and Minikube
 
@@ -83,7 +84,11 @@ async function configureSystemEnvironment(
   }
 
   // TODO: need to add logic here to wait for tiller to be ready
-  await execa("helm", ["init", "--service-account", "default", "--upgrade"])
+  await helm(sysProvider,
+    "init", "--wait",
+    "--service-account", "default",
+    "--upgrade",
+  )
 
   const sysStatus = await getEnvironmentStatus({
     ctx: sysCtx,