Merge branch 'main' into fix-include-needs-transitive

pkg/state/helmx.go

@@ -257,6 +257,9 @@ func (st *HelmState) appendCascadeFlags(flags []string, helm helmexec.Interface,
 
 // append hide-notes flags to helm flags
 func (st *HelmState) appendHideNotesFlags(flags []string, helm helmexec.Interface, ops *SyncOpts) []string {
+	if ops == nil {
+		return flags
+	}
 	// see https://github.com/helm/helm/releases/tag/v3.16.0
 	if !helm.IsVersionAtLeast("3.16.0") {
 		return flags

pkg/state/helmx_test.go

@@ -442,6 +442,15 @@ func TestAppendHideNotesFlags(t *testing.T) {
 				expected: []string{"--hide-notes"},
 			},
 		},
+		{
+			name: "no hide-notes when ops is nil",
+			args: args{
+				flags:    []string{},
+				helm:     testutil.NewVersionHelmExec("3.16.0"),
+				opt:      nil,
+				expected: []string{},
+			},
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {

pkg/state/state_test.go

@@ -261,10 +261,12 @@ func TestHelmState_flagsForUpgrade(t *testing.T) {
 			},
 		},
 		{
-			name: "force",
+			name: "force-helm3",
 			defaults: HelmSpec{
-				Force: false,
+				Force:           false,
+				CreateNamespace: &disable,
 			},
+			version: semver.MustParse("3.10.0"),
 			release: &ReleaseSpec{
 				Chart:     "test/chart",
 				Version:   "0.1",
@@ -279,10 +281,32 @@ func TestHelmState_flagsForUpgrade(t *testing.T) {
 			},
 		},
 		{
-			name: "force-from-default",
+			name: "force-helm4",
 			defaults: HelmSpec{
-				Force: true,
+				Force:           false,
+				CreateNamespace: &disable,
 			},
+			version: semver.MustParse("4.0.0"),
+			release: &ReleaseSpec{
+				Chart:     "test/chart",
+				Version:   "0.1",
+				Force:     &enable,
+				Name:      "test-charts",
+				Namespace: "test-namespace",
+			},
+			want: []string{
+				"--version", "0.1",
+				"--force-replace",
+				"--namespace", "test-namespace",
+			},
+		},
+		{
+			name: "force-from-default-helm3",
+			defaults: HelmSpec{
+				Force:           true,
+				CreateNamespace: &disable,
+			},
+			version: semver.MustParse("3.10.0"),
 			release: &ReleaseSpec{
 				Chart:     "test/chart",
 				Version:   "0.1",
@@ -295,6 +319,63 @@ func TestHelmState_flagsForUpgrade(t *testing.T) {
 				"--namespace", "test-namespace",
 			},
 		},
+		{
+			name: "force-from-default-helm4",
+			defaults: HelmSpec{
+				Force:           true,
+				CreateNamespace: &disable,
+			},
+			version: semver.MustParse("4.0.0"),
+			release: &ReleaseSpec{
+				Chart:     "test/chart",
+				Version:   "0.1",
+				Force:     &disable,
+				Name:      "test-charts",
+				Namespace: "test-namespace",
+			},
+			want: []string{
+				"--version", "0.1",
+				"--namespace", "test-namespace",
+			},
+		},
+		{
+			name: "force-from-default-nil-force-helm3",
+			defaults: HelmSpec{
+				Force:           true,
+				CreateNamespace: &disable,
+			},
+			version: semver.MustParse("3.10.0"),
+			release: &ReleaseSpec{
+				Chart:     "test/chart",
+				Version:   "0.1",
+				Name:      "test-charts",
+				Namespace: "test-namespace",
+			},
+			want: []string{
+				"--version", "0.1",
+				"--force",
+				"--namespace", "test-namespace",
+			},
+		},
+		{
+			name: "force-from-default-nil-force-helm4",
+			defaults: HelmSpec{
+				Force:           true,
+				CreateNamespace: &disable,
+			},
+			version: semver.MustParse("4.0.0"),
+			release: &ReleaseSpec{
+				Chart:     "test/chart",
+				Version:   "0.1",
+				Name:      "test-charts",
+				Namespace: "test-namespace",
+			},
+			want: []string{
+				"--version", "0.1",
+				"--force-replace",
+				"--namespace", "test-namespace",
+			},
+		},
 		{
 			name: "recreate-pods",
 			defaults: HelmSpec{