fix: chartifyOpts ignore release set values (#896)

* fix: chartifyOpts ignore release set values

Signed-off-by: yxxhero <aiopsclub@163.com>

pkg/state/state.go

@@ -1224,11 +1224,13 @@ func (st *HelmState) PrepareCharts(helm helmexec.Interface, dir string, concurre
 
 					chartifyOpts.KubeVersion = release.KubeVersion
 					chartifyOpts.ApiVersions = release.ApiVersions
+					// https://github.com/helmfile/helmfile/pull/867
+					// https://github.com/helmfile/helmfile/issues/895
 					var flags []string
 					for _, s := range opts.Set {
 						flags = append(flags, "--set", s)
 					}
-					chartifyOpts.SetFlags = flags
+					chartifyOpts.SetFlags = append(chartifyOpts.SetFlags, flags...)
 
 					out, err := c.Chartify(release.Name, chartPath, chartify.WithChartifyOpts(chartifyOpts))
 					if err != nil {

test/integration/test-cases/chartify/input/helmfile.yaml

@@ -11,4 +11,6 @@ releases:
           - path: "/spec/strategy/type"
             op: replace
             value: Recreate
-
+    set:
+      - name: image.pullPolicy
+        value: Always

test/integration/test-cases/chartify/output/template

@@ -45,7 +45,7 @@ spec:
     spec:
       containers:
       - image: docker.io/citizenstig/httpbin:latest
-        imagePullPolicy: IfNotPresent
+        imagePullPolicy: Always
         livenessProbe:
           httpGet:
             path: /

test/integration/test-cases/chartify/output/template-set

@@ -45,7 +45,7 @@ spec:
     spec:
       containers:
       - image: docker.io/citizenstig/httpbin:v2
-        imagePullPolicy: IfNotPresent
+        imagePullPolicy: Always
         livenessProbe:
           httpGet:
             path: /