diff --git a/pkg/app/testdata/app_diff_test/show_diff_on_changed_selected_release_with_reinstall b/pkg/app/testdata/app_diff_test/show_diff_on_changed_selected_release_with_reinstall index 0d9d039d..66b419fa 100644 --- a/pkg/app/testdata/app_diff_test/show_diff_on_changed_selected_release_with_reinstall +++ b/pkg/app/testdata/app_diff_test/show_diff_on_changed_selected_release_with_reinstall @@ -1,36 +1,5 @@ processing file "helmfile.yaml" in directory "." changing working directory to "/path/to" -first-pass rendering starting for "helmfile.yaml.part.0": inherited=&{default map[] map[]}, overrode= -first-pass uses: &{default map[] map[]} -first-pass rendering output of "helmfile.yaml.part.0": - 0: - 1: releases: - 2: - name: a - 3: chart: incubator/raw - 4: namespace: default - 5: updateStrategy: reinstall - 6: - name: b - 7: chart: incubator/raw - 8: namespace: default - 9: - -first-pass produced: &{default map[] map[]} -first-pass rendering result of "helmfile.yaml.part.0": {default map[] map[]} -vals: -map[] -defaultVals:[] -second-pass rendering result of "helmfile.yaml.part.0": - 0: - 1: releases: - 2: - name: a - 3: chart: incubator/raw - 4: namespace: default - 5: updateStrategy: reinstall - 6: - name: b - 7: chart: incubator/raw - 8: namespace: default - 9: - merged environment: &{default map[] map[]} 1 release(s) matching name=a found in helmfile.yaml diff --git a/pkg/app/testdata/testapply/install-with-upgrade-with-reinstall/log b/pkg/app/testdata/testapply/install-with-upgrade-with-reinstall/log index 4967a798..39f26151 100644 --- a/pkg/app/testdata/testapply/install-with-upgrade-with-reinstall/log +++ b/pkg/app/testdata/testapply/install-with-upgrade-with-reinstall/log @@ -1,48 +1,5 @@ processing file "helmfile.yaml" in directory "." changing working directory to "/path/to" -first-pass rendering starting for "helmfile.yaml.part.0": inherited=&{default map[] map[]}, overrode= -first-pass uses: &{default map[] map[]} -first-pass rendering output of "helmfile.yaml.part.0": - 0: - 1: releases: - 2: - name: baz - 3: chart: stable/mychart3 - 4: disableValidationOnInstall: true - 5: updateStrategy: reinstall - 6: - name: foo - 7: chart: stable/mychart1 - 8: disableValidationOnInstall: true - 9: needs: -10: - bar -11: - name: bar -12: chart: stable/mychart2 -13: disableValidation: true -14: updateStrategy: reinstall -15: - -first-pass produced: &{default map[] map[]} -first-pass rendering result of "helmfile.yaml.part.0": {default map[] map[]} -vals: -map[] -defaultVals:[] -second-pass rendering result of "helmfile.yaml.part.0": - 0: - 1: releases: - 2: - name: baz - 3: chart: stable/mychart3 - 4: disableValidationOnInstall: true - 5: updateStrategy: reinstall - 6: - name: foo - 7: chart: stable/mychart1 - 8: disableValidationOnInstall: true - 9: needs: -10: - bar -11: - name: bar -12: chart: stable/mychart2 -13: disableValidation: true -14: updateStrategy: reinstall -15: - merged environment: &{default map[] map[]} 3 release(s) found in helmfile.yaml @@ -64,6 +21,8 @@ GROUP RELEASES 2 default//foo processing releases in group 1/2: default//baz, default//bar +reinstallIfForbidden update strategy - reinstalling... +reinstallIfForbidden update strategy - reinstalling... processing releases in group 2/2: default//foo getting deployed release version failed: Failed to get the version for: mychart1 diff --git a/pkg/app/testdata/testapply/install-with-upgrade-with-skip-diff-on-install-with-reinstall/log b/pkg/app/testdata/testapply/install-with-upgrade-with-skip-diff-on-install-with-reinstall/log index 4967a798..39f26151 100644 --- a/pkg/app/testdata/testapply/install-with-upgrade-with-skip-diff-on-install-with-reinstall/log +++ b/pkg/app/testdata/testapply/install-with-upgrade-with-skip-diff-on-install-with-reinstall/log @@ -1,48 +1,5 @@ processing file "helmfile.yaml" in directory "." changing working directory to "/path/to" -first-pass rendering starting for "helmfile.yaml.part.0": inherited=&{default map[] map[]}, overrode= -first-pass uses: &{default map[] map[]} -first-pass rendering output of "helmfile.yaml.part.0": - 0: - 1: releases: - 2: - name: baz - 3: chart: stable/mychart3 - 4: disableValidationOnInstall: true - 5: updateStrategy: reinstall - 6: - name: foo - 7: chart: stable/mychart1 - 8: disableValidationOnInstall: true - 9: needs: -10: - bar -11: - name: bar -12: chart: stable/mychart2 -13: disableValidation: true -14: updateStrategy: reinstall -15: - -first-pass produced: &{default map[] map[]} -first-pass rendering result of "helmfile.yaml.part.0": {default map[] map[]} -vals: -map[] -defaultVals:[] -second-pass rendering result of "helmfile.yaml.part.0": - 0: - 1: releases: - 2: - name: baz - 3: chart: stable/mychart3 - 4: disableValidationOnInstall: true - 5: updateStrategy: reinstall - 6: - name: foo - 7: chart: stable/mychart1 - 8: disableValidationOnInstall: true - 9: needs: -10: - bar -11: - name: bar -12: chart: stable/mychart2 -13: disableValidation: true -14: updateStrategy: reinstall -15: - merged environment: &{default map[] map[]} 3 release(s) found in helmfile.yaml @@ -64,6 +21,8 @@ GROUP RELEASES 2 default//foo processing releases in group 1/2: default//baz, default//bar +reinstallIfForbidden update strategy - reinstalling... +reinstallIfForbidden update strategy - reinstalling... processing releases in group 2/2: default//foo getting deployed release version failed: Failed to get the version for: mychart1 diff --git a/pkg/state/temp_test.go b/pkg/state/temp_test.go index f0eed882..5b0d4d13 100644 --- a/pkg/state/temp_test.go +++ b/pkg/state/temp_test.go @@ -38,39 +38,39 @@ func TestGenerateID(t *testing.T) { run(testcase{ subject: "baseline", release: ReleaseSpec{Name: "foo", Chart: "incubator/raw"}, - want: "foo-values-54f5f6cdb5", + want: "foo-values-788ff4f7f7", }) run(testcase{ subject: "different bytes content", release: ReleaseSpec{Name: "foo", Chart: "incubator/raw"}, data: []byte(`{"k":"v"}`), - want: "foo-values-6bc8f7944b", + want: "foo-values-757ff75d94", }) run(testcase{ subject: "different map content", release: ReleaseSpec{Name: "foo", Chart: "incubator/raw"}, data: map[string]any{"k": "v"}, - want: "foo-values-dcffdcb8", + want: "foo-values-7b89b8c7cb", }) run(testcase{ subject: "different chart", release: ReleaseSpec{Name: "foo", Chart: "stable/envoy"}, - want: "foo-values-6d4c6fd548", + want: "foo-values-5fb75677fd", }) run(testcase{ subject: "different name", release: ReleaseSpec{Name: "bar", Chart: "incubator/raw"}, - want: "bar-values-76974767c8", + want: "bar-values-847b48bc58", }) run(testcase{ subject: "specific ns", release: ReleaseSpec{Name: "foo", Chart: "incubator/raw", Namespace: "myns"}, - want: "myns-foo-values-77bd9cc6fb", + want: "myns-foo-values-6fff5b8664", }) for id, n := range ids {