fix issues

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

cmd/apply.go

@@ -71,6 +71,7 @@ func NewApplyCmd(globalCfg *config.GlobalImpl) *cobra.Command {
 	f.StringVar(&applyOptions.Cascade, "cascade", "", "pass cascade to helm exec, default: background")
 	f.StringArrayVar(&applyOptions.SuppressOutputLineRegex, "suppress-output-line-regex", nil, "a list of regex patterns to suppress output lines from the diff output")
 	f.StringVar(&applyOptions.DryRun, "dry-run", "", "pass dry-run to helm exec")
+	f.Lookup("dry-run").NoOptDefVal = "client"
 
 	return cmd
 }

cmd/sync.go

@@ -49,6 +49,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
 }

pkg/state/helmx.go

@@ -113,11 +113,8 @@ func (st *HelmState) appendDryRunFlags(flags []string, helm helmexec.Interface,
 	if !helm.IsVersionAtLeast("3.13.0") {
 		return flags
 	}
-	switch {
+	if opt != nil && opt.DryRun != "" {
-	case opt != nil && opt.DryRun != "":
+		flags = append(flags, fmt.Sprintf("--dry-run=%s", opt.DryRun))
-		flags = append(flags, "--dry-run", opt.DryRun)
-	case opt != nil && opt.DryRun == "":
-		flags = append(flags, "--dry-run", "client")
 	}
 	return flags
 }

pkg/state/helmx_test.go

@@ -294,7 +294,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"},
 			},
 		},
 		{
@@ -303,7 +303,7 @@ func TestAppendDryRunFlags(t *testing.T) {
 				flags:    []string{},
 				dryRun:   "",
 				helm:     testutil.NewVersionHelmExec("3.13.0"),
-				expected: []string{"--dry-run", "client"},
+				expected: []string{},
 			},
 		},
 		{
@@ -312,7 +312,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"},
 			},
 		},
 		{

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

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