From 87dc9225b844920a81b79dc32bf340f0f39eedc9 Mon Sep 17 00:00:00 2001
From: Jon Edvald <edvald@gmail.com>
Date: Tue, 30 Jul 2019 17:09:22 +0200
Subject: [PATCH] fix(k8s): avoid "no deployed releases" errors after Helm
 install failure (#1046)

---
 garden-service/src/plugins/kubernetes/helm/deployment.ts | 3 +++
 garden-service/src/plugins/kubernetes/helm/helm-cli.ts   | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/garden-service/src/plugins/kubernetes/helm/deployment.ts b/garden-service/src/plugins/kubernetes/helm/deployment.ts
index 4766083853..00f0ee60af 100644
--- a/garden-service/src/plugins/kubernetes/helm/deployment.ts
+++ b/garden-service/src/plugins/kubernetes/helm/deployment.ts
@@ -59,6 +59,9 @@ export async function deployService(
       "--name", releaseName,
       "--namespace", namespace,
       "--values", valuesPath,
+      // Make sure chart gets purged if it fails to install
+      "--atomic",
+      "--timeout", "600",
     ]
     if (force) {
       installArgs.push("--replace")
diff --git a/garden-service/src/plugins/kubernetes/helm/helm-cli.ts b/garden-service/src/plugins/kubernetes/helm/helm-cli.ts
index a8d6a80761..35aa50feb0 100644
--- a/garden-service/src/plugins/kubernetes/helm/helm-cli.ts
+++ b/garden-service/src/plugins/kubernetes/helm/helm-cli.ts
@@ -49,5 +49,7 @@ export async function helm(namespace: string, context: string, log: LogEntry, ..
   return helmCmd.stdout({
     log,
     args,
+    // Helm itself will time out pretty reliably, so we shouldn't time out early on our side.
+    timeout: 3600,
   })
 }