improvement(k8s): also delete metadata namespace when cleaning up

Closes #1266
garden-io · Oct 15, 2019 · f3af877 · f3af877
1 parent 21ad8f2
commit f3af877
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/garden-service/src/plugins/kubernetes/init.ts b/garden-service/src/plugins/kubernetes/init.ts
@@ -7,7 +7,7 @@
  */
 
 import { KubeApi, KubernetesError } from "./api"
-import { getAppNamespace, prepareNamespaces, deleteNamespaces } from "./namespace"
+import { getAppNamespace, prepareNamespaces, deleteNamespaces, getMetadataNamespace } from "./namespace"
 import { KubernetesPluginContext, KubernetesConfig } from "./config"
 import { checkTillerStatus, installTiller } from "./helm/tiller"
 import {
@@ -233,13 +233,14 @@ export async function cleanupEnvironment({ ctx, log }: CleanupEnvironmentParams)
   const k8sCtx = <KubernetesPluginContext>ctx
   const api = await KubeApi.factory(log, k8sCtx.provider)
   const namespace = await getAppNamespace(k8sCtx, log, k8sCtx.provider)
+  const metadataNamespace = await getMetadataNamespace(k8sCtx, log, k8sCtx.provider)
   const entry = log.info({
     section: "kubernetes",
     msg: `Deleting namespace ${namespace} (this may take a while)`,
     status: "active",
   })
 
-  await deleteNamespaces([namespace], api, entry)
+  await deleteNamespaces([namespace, metadataNamespace], api, entry)
 
   return {}
 }