Merge branch 'main' into dependabot/npm_and_yarn/website/npm_and_yarn…

…-c82b2b8218
cloudposse · Oct 30, 2024 · 13c9639 · 13c9639
2 parents af9f3ec + 315e694
commit 13c9639
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/examples/demo-helmfile/atmos.yaml b/examples/demo-helmfile/atmos.yaml
@@ -4,16 +4,24 @@ schemas:
   atmos:
     manifest: "schemas/atmos-manifest.json"
 
+
+templates:
+  settings:
+    enabled: true
+    sprig:
+      enabled: true
+    gomplate:
+      enabled: true
+
 components:
   helmfile:
     base_path: "components/helmfile"
     use_eks: false
-    kubeconfig_path: "{{ .Env.KUBECONFIG }}"
 
 stacks:
   base_path: "stacks"
   included_paths:
-    - "**/*"
+    - "deploy/**/*"
   excluded_paths:
     - "**/_defaults.yaml"
   name_pattern: "{stage}"

diff --git a/examples/demo-helmfile/stacks/mixins/k3s.yaml b/examples/demo-helmfile/stacks/mixins/k3s.yaml
@@ -1,4 +1,4 @@
 env:
   # Configure `kubectl` to use the `kubeconfig.yaml` file generated by the K3s server
-  KUBECONFIG: "./kubeconfig.yaml"
-
+  # This needs to be an absolute path, since `helmfile` is executed from the component's directory
+  KUBECONFIG: '{{ .Env.KUBECONFIG | default (printf "%s/kubeconfig.yaml" (getenv "PWD")) }}'
diff --git a/internal/exec/helmfile.go b/internal/exec/helmfile.go
@@ -228,6 +228,10 @@ func ExecuteHelmfile(info schema.ConfigAndStacksInfo) error {
 		envVars = append(envVars, fmt.Sprintf("REGION=%s", context.Region))
 	}
 
+	if cliConfig.Components.Helmfile.KubeconfigPath != "" {
+		envVars = append(envVars, fmt.Sprintf("KUBECONFIG=%s", cliConfig.Components.Helmfile.KubeconfigPath))
+	}
+
 	if cliConfig.Components.Helmfile.UseEKS {
 		envVars = append(envVars, envVarsEKS...)
 	}

diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -48,7 +48,7 @@ var (
 			},
 			Helmfile: schema.Helmfile{
 				BasePath:              "components/helmfile",
-				KubeconfigPath:        "/dev/shm",
+				KubeconfigPath:        "",
 				HelmAwsProfilePattern: "{namespace}-{tenant}-gbl-{stage}-helm",
 				ClusterNamePattern:    "{namespace}-{tenant}-{environment}-{stage}-eks-cluster",
 				UseEKS:                true,