From e1ad8a8b9d5e4794d084ed080f07cb3ce67197be Mon Sep 17 00:00:00 2001
From: Emanuele Libralato <e.libralato@gmail.com>
Date: Mon, 24 Feb 2020 15:55:14 +0100
Subject: [PATCH] fix(k8s): include value files in default Helm include clause

---
 garden-service/src/plugins/kubernetes/helm/config.ts        | 6 +++++-
 .../test/integ/src/plugins/kubernetes/helm/config.ts        | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/garden-service/src/plugins/kubernetes/helm/config.ts b/garden-service/src/plugins/kubernetes/helm/config.ts
index 238d457cb8..1587935d8d 100644
--- a/garden-service/src/plugins/kubernetes/helm/config.ts
+++ b/garden-service/src/plugins/kubernetes/helm/config.ts
@@ -289,9 +289,13 @@ export async function configureHelmModule({
     "release-name": getReleaseName(moduleConfig),
   }
 
+  const valueFiles = moduleConfig.spec.valueFiles
+
   // Automatically set the include if not explicitly set
   if (!(moduleConfig.include || moduleConfig.exclude)) {
-    moduleConfig.include = containsSources ? ["*", "charts/**/*", "templates/**/*"] : []
+    moduleConfig.include = containsSources
+      ? ["*", "charts/**/*", "templates/**/*", ...valueFiles]
+      : ["*.yaml", "*.yml", ...valueFiles]
   }
 
   return { moduleConfig }
diff --git a/garden-service/test/integ/src/plugins/kubernetes/helm/config.ts b/garden-service/test/integ/src/plugins/kubernetes/helm/config.ts
index 921c59828c..822a9c401d 100644
--- a/garden-service/test/integ/src/plugins/kubernetes/helm/config.ts
+++ b/garden-service/test/integ/src/plugins/kubernetes/helm/config.ts
@@ -144,11 +144,11 @@ describe("configureHelmModule", () => {
     expect(configExclude.include).to.be.undefined
   })
 
-  it("should set include to empty if module does not have local chart sources", async () => {
+  it("should set include to default if module does not have local chart sources", async () => {
     // So that Chart.yaml isn't found
     patchModuleConfig("api", { spec: { chartPath: "invalid-path" } })
     const config = await garden.resolveModuleConfig(garden.log, "api")
-    expect(config.include).to.eql([])
+    expect(config.include).to.eql(["*.yaml", "*.yml"])
   })
 
   it("should not return a serviceConfig if skipDeploy=true", async () => {