add namespace to state vals for app

DataReply · Jan 13, 2021 · d342612 · d342612
1 parent 4621259
commit d342612
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 11 deletions.
diff --git a/cmd/apply.go b/cmd/apply.go
@@ -25,7 +25,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-func templateApp(app string, inputFilePath string, appGroupDir string, lint bool) error {
+func templateApp(app string, namespace string, inputFilePath string, appGroupDir string, lint bool) error {
 
 	targeAppDir := utils.ConcatDirs(appGroupDir, app)
 
@@ -39,7 +39,7 @@ func templateApp(app string, inputFilePath string, appGroupDir string, lint bool
 			return err
 		}
 	}
-	err = helmfileEngine.Template(app, inputFilePath, targeAppDir)
+	err = helmfileEngine.Template(app, namespace, inputFilePath, targeAppDir)
 	if err != nil {
 		return err
 	}
@@ -87,7 +87,7 @@ func applyAppGroup(group string, namespace string, outputDir string, appFilter s
 				}
 			}
 
-			err = templateApp(app, matchedAppFile, targetAppGroupDir, lint)
+			err = templateApp(app, namespace, matchedAppFile, targetAppGroupDir, lint)
 			if err != nil {
 				return fmt.Errorf("templating app: %w", err)
 			}
@@ -157,7 +157,7 @@ func init() {
 	rootCmd.AddCommand(applyCmd)
 
 	applyCmd.Flags().BoolP("lint", "l", false, "Lint temlate")
-
+	applyCmd.Flags().BoolP("dry-run", "d", false, "Dry Run")
 	applyCmd.Flags().StringP("namespace", "n", "", "Target namespace")
 	applyCmd.MarkFlagRequired("namespace")
 

diff --git a/pkg/template/helmfile.go b/pkg/template/helmfile.go
@@ -32,10 +32,10 @@ func NewHelmFileEngine(Opts Opts, log logr.Logger) *HelmFileEngine {
 	return &HelmFileEngine{Opts, log}
 }
 
-func (e *HelmFileEngine) Template(name string, inputFilePath string, outputFilePath string) error {
+func (e *HelmFileEngine) Template(name string,namespace string, inputFilePath string, outputFilePath string) error {
 
 	inputArgs := append([]string{"--environment", e.Opts.Environment,
-		"--file", inputFilePath, "--state-values-set", fmt.Sprintf("app=%s", name),
+		"--file", inputFilePath, "--state-values-set", fmt.Sprintf("app=%s,namespace=%s", name,namespace),
 		"template", "--output-dir", outputFilePath, fmt.Sprintf("--skip-deps=%t", e.Opts.SkipDeps)}, e.Opts.ExtraArgs...)
 
 	cmd := exec.Command("helmfile", inputArgs...)

diff --git a/realm/namespaces/_defaults.yaml b/realm/namespaces/_defaults.yaml
@@ -1,8 +1,8 @@
 repositories:
 # To use official "stable" charts a.k.a https://github.com/helm/charts/tree/master/stable
 - name: stable
-  url: https://kubernetes-charts.storage.googleapis.com
+  url: https://kubernetes-charts-incubator.storage.googleapis.com
 
 releases:
-  - name: dummy
+  - name: dummydummy
     chart: stable/raw
diff --git a/realm/namespaces/default/monitoring/dummy.yaml b/realm/namespaces/default/monitoring/dummy.yaml
@@ -1,4 +1,6 @@
-
+bases:
+- ../../_defaults.yaml
+- ../../../values/env/dev/{{.Environment.Values.namespace}}/values.yaml
 
 releases:
   - name: dummy

diff --git a/realm/namespaces/default/monitoring/test.yaml b/realm/namespaces/default/monitoring/test.yaml
@@ -1,4 +1,7 @@
 
+bases:
+- ../../_defaults.yaml
+- ../../../values/env/dev/{{.Environment.Values.namespace}}/values.yaml
 
 releases:
   - name: test
@@ -10,7 +13,7 @@ releases:
        apiVersion: v1
        kind: ConfigMap
        metadata:
-         name: test
+         name: test-{{.Values.test}}
     
 
 

diff --git a/realm/namespaces/default/testing/test1.yaml b/realm/namespaces/default/testing/test1.yaml
@@ -1,5 +1,7 @@
 
-
+bases:
+- ../../_defaults.yaml
+- ../../../values/env/dev/{{.Environment.values.namespace}}/values.yaml
 releases:
   - name: test1
     chart: incubator/raw  

diff --git a/realm/values/env/dev/default/values.yaml b/realm/values/env/dev/default/values.yaml
@@ -0,0 +1,4 @@
+
+---
+values:
+- test: 1
-Original file line number
+Diff line change
@@ -0,0 +1,4 @@
+    ---
+    values:
+    - test: 1