fix(k8s): make sure Helm 3 migration is run for project namespaces

garden-io · Dec 18, 2019 · 7040373 · 7040373
1 parent 765b324
commit 7040373
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/garden-service/src/plugins/kubernetes/init.ts b/garden-service/src/plugins/kubernetes/init.ts
@@ -196,9 +196,9 @@ export async function prepareEnvironment(params: PrepareEnvironmentParams): Prom
   const k8sCtx = <KubernetesPluginContext>ctx
 
   // Migrate from Helm 2.x and remove Tiller from project namespace, if necessary
-  const systemServiceNames = k8sCtx.provider.config._systemServices
+  const systemNamespace = k8sCtx.provider.config.gardenSystemNamespace
 
-  if (systemServiceNames.length === 0 && status.detail.projectTillerInstalled) {
+  if (k8sCtx.provider.config.namespace !== systemNamespace && status.detail.projectTillerInstalled) {
     const api = await KubeApi.factory(log, k8sCtx.provider)
     const namespace = await getAppNamespace(ctx, log, k8sCtx.provider)
     await migrateToHelm3(k8sCtx, api, namespace, log)