fix(k8s): don't include any hooks when checking resource statuses

Fixed #1205
garden-io · Sep 19, 2019 · ca6462c · ca6462c
1 parent bc05b04
commit ca6462c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/garden-service/src/plugins/kubernetes/helm/common.ts b/garden-service/src/plugins/kubernetes/helm/common.ts
@@ -68,8 +68,14 @@ export async function getChartResources(ctx: PluginContext, module: Module, log:
 
   const resources = objects
     .filter(obj => {
+      // Don't try to check status of hooks
       const helmHook = getAnnotation(obj, "helm.sh/hook")
-      if (helmHook && helmHook.startsWith("test-")) {
+      if (helmHook) {
+        return false
+      }
+
+      // Ephemeral objects should also not be checked
+      if (obj.kind === "Pod" || obj.kind === "Job") {
         return false
       }
 

diff --git a/garden-service/test/unit/src/plugins/kubernetes/helm/common.ts b/garden-service/test/unit/src/plugins/kubernetes/helm/common.ts
@@ -462,7 +462,7 @@ describe("Helm common functions", () => {
       expect(await getChartResources(ctx, module, log)).to.not.throw
     })
 
-    it("should filter out test pods", async () => {
+    it("should filter out resources with hooks", async () => {
       const module = await graph.getModule("chart-with-test-pod")
       const resources = await getChartResources(ctx, module, log)