fix issues

Signed-off-by: yxxhero <[email protected]>
helmfile · Feb 13, 2024 · fb7c54e · fb7c54e
1 parent f4629d4
commit fb7c54e
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 14 deletions.
diff --git a/cmd/apply.go b/cmd/apply.go
@@ -69,6 +69,7 @@ func NewApplyCmd(globalCfg *config.GlobalImpl) *cobra.Command {
 	f.StringArrayVar(&applyOptions.PostRendererArgs, "post-renderer-args", nil, `pass --post-renderer-args to "helm template" or "helm upgrade --install"`)
 	f.StringVar(&applyOptions.Cascade, "cascade", "", "pass cascade to helm exec, default: background")
 	f.StringVar(&applyOptions.DryRun, "dry-run", "", "pass dry-run to helm exec")
+	f.Lookup("dry-run").NoOptDefVal = "client"
 
 	return cmd
 }
diff --git a/cmd/sync.go b/cmd/sync.go
@@ -48,6 +48,7 @@ func NewSyncCmd(globalCfg *config.GlobalImpl) *cobra.Command {
 	f.StringArrayVar(&syncOptions.PostRendererArgs, "post-renderer-args", nil, `pass --post-renderer-args to "helm template" or "helm upgrade --install"`)
 	f.StringVar(&syncOptions.Cascade, "cascade", "", "pass cascade to helm exec, default: background")
 	f.StringVar(&syncOptions.DryRun, "dry-run", "", "pass dry-run to helm exec")
+	f.Lookup("dry-run").NoOptDefVal = "client"
 
 	return cmd
 }
diff --git a/pkg/state/helmx.go b/pkg/state/helmx.go
@@ -100,11 +100,8 @@ func (st *HelmState) appendDryRunFlags(flags []string, helm helmexec.Interface,
 	if !helm.IsVersionAtLeast("3.13.0") {
 		return flags
 	}
-	switch {
-	case opt != nil && opt.DryRun != "":
-		flags = append(flags, "--dry-run", opt.DryRun)
-	case opt != nil && opt.DryRun == "":
-		flags = append(flags, "--dry-run", "client")
+	if opt != nil && opt.DryRun != "" {
+		flags = append(flags, fmt.Sprintf("--dry-run=%s", opt.DryRun))
 	}
 	return flags
 }

diff --git a/pkg/state/helmx_test.go b/pkg/state/helmx_test.go
@@ -215,7 +215,7 @@ func TestAppendDryRunFlags(t *testing.T) {
 				flags:    []string{},
 				dryRun:   "client",
 				helm:     testutil.NewVersionHelmExec("3.13.0"),
-				expected: []string{"--dry-run", "client"},
+				expected: []string{"--dry-run=client"},
 			},
 		},
 		{
@@ -224,7 +224,7 @@ func TestAppendDryRunFlags(t *testing.T) {
 				flags:    []string{},
 				dryRun:   "",
 				helm:     testutil.NewVersionHelmExec("3.13.0"),
-				expected: []string{"--dry-run", "client"},
+				expected: []string{},
 			},
 		},
 		{
@@ -233,7 +233,7 @@ func TestAppendDryRunFlags(t *testing.T) {
 				flags:    []string{},
 				dryRun:   "server",
 				helm:     testutil.NewVersionHelmExec("3.13.0"),
-				expected: []string{"--dry-run", "server"},
+				expected: []string{"--dry-run=server"},
 			},
 		},
 		{

diff --git a/test/integration/test-cases/happypath/input/happypath.yaml b/test/integration/test-cases/happypath/input/happypath.yaml
@@ -7,9 +7,6 @@ repositories:
   - name: incubator
     url: https://charts.helm.sh/incubator
 
-helmDefaults:
-  kubeContext: minikube
-
 releases:
 
   - name: httpbin

diff --git a/test/integration/test-cases/secretssops/input/secretssops.yaml b/test/integration/test-cases/secretssops/input/secretssops.yaml
@@ -16,9 +16,6 @@ repositories:
   - name: incubator
     url: https://charts.helm.sh/incubator
 
-helmDefaults:
-  kubeContext: minikube
-
 releases:
 
   - name: raw