From d61290acb2ff7ce823ac895263b6531966a7ba86 Mon Sep 17 00:00:00 2001
From: Jon Edvald <edvald@gmail.com>
Date: Tue, 19 Mar 2019 00:27:51 +0100
Subject: [PATCH] improvement(k8s): don't require username input when namespace
 is set

---
 garden-service/src/plugins/kubernetes/init.ts | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/garden-service/src/plugins/kubernetes/init.ts b/garden-service/src/plugins/kubernetes/init.ts
index 75ff4527b2..c8944f3fd1 100644
--- a/garden-service/src/plugins/kubernetes/init.ts
+++ b/garden-service/src/plugins/kubernetes/init.ts
@@ -73,19 +73,19 @@ async function prepareNamespaces({ ctx }: GetEnvironmentStatusParams) {
 }
 
 export async function getRemoteEnvironmentStatus({ ctx, log }: GetEnvironmentStatusParams) {
-  const k8sCtx = <KubernetesPluginContext>ctx
-  const loggedIn = await getLoginStatus({ ctx: k8sCtx, log })
+  const provider = <KubernetesProvider>ctx.provider
+  const loggedIn = await getLoginStatus({ ctx, log })
 
-  if (!loggedIn) {
+  if (!loggedIn && !provider.config.namespace) {
     return {
       ready: false,
       needUserInput: true,
     }
   }
 
-  await prepareNamespaces({ ctx: k8sCtx, log })
+  await prepareNamespaces({ ctx, log })
 
-  const ready = (await checkTillerStatus(k8sCtx, k8sCtx.provider, log)) === "ready"
+  const ready = (await checkTillerStatus(ctx, provider, log)) === "ready"
 
   // Note: We don't need the system namespaces for remote k8s for now
 
@@ -177,15 +177,13 @@ export async function getLocalEnvironmentStatus({ ctx, log }: GetEnvironmentStat
 }
 
 export async function prepareRemoteEnvironment({ ctx, log }: PrepareEnvironmentParams) {
-  const k8sCtx = <KubernetesPluginContext>ctx
-  const loggedIn = await getLoginStatus({ ctx: k8sCtx, log })
+  const provider = <KubernetesProvider>ctx.provider
+  const loggedIn = await getLoginStatus({ ctx, log })
 
-  if (!loggedIn) {
-    await login({ ctx: k8sCtx, log })
+  if (!loggedIn && !provider.config.namespace) {
+    await login({ ctx, log })
   }
 
-  const provider = k8sCtx.provider
-
   // Note: We don't need the system namespaces for remote k8s for now
 
   // const api = new KubeApi(provider.config.context)
@@ -194,7 +192,7 @@ export async function prepareRemoteEnvironment({ ctx, log }: PrepareEnvironmentP
   //   await recreateSystemNamespaces(api, log)
   // }
 
-  await installTiller(k8sCtx, provider, log)
+  await installTiller(ctx, provider, log)
 
   return {}
 }