From 410d84bba5eb3063f874b80ef4166f8641910164 Mon Sep 17 00:00:00 2001 From: jayme-github Date: Thu, 6 Mar 2025 15:52:26 +0100 Subject: [PATCH] Don't warn if this and the needed release set installed: false (#1958) When the evaluated release has installed: false it's perfectly fine that a needed release is installed: false as well. fixes #1464 Signed-off-by: jayme-github --- .../app_diff_test_1/delete_foo_and_bar_when_bar_needs_foo | 1 - .../app_diff_test_1/delete_foo_and_bar_when_foo_needs_bar | 1 - pkg/app/testdata/app_diff_test_1/smoke | 1 - .../app_diff_test_2/delete_foo_and_bar_when_bar_needs_foo | 1 - .../app_diff_test_2/delete_foo_and_bar_when_foo_needs_bar | 1 - pkg/app/testdata/app_diff_test_2/smoke | 1 - .../testapply/delete_foo_and_bar_when_bar_needs_foo/log | 1 - .../testapply/delete_foo_and_bar_when_foo_needs_bar/log | 1 - pkg/app/testdata/testapply/smoke/log | 1 - .../testdestroy/destroy_only_one_release_with_selector/log | 1 - pkg/app/testdata/testdestroy/smoke/log | 2 -- .../testdestroy_2/destroy_only_one_release_with_selector/log | 1 - pkg/app/testdata/testdestroy_2/smoke/log | 2 -- pkg/state/state.go | 2 +- 14 files changed, 1 insertion(+), 16 deletions(-) diff --git a/pkg/app/testdata/app_diff_test_1/delete_foo_and_bar_when_bar_needs_foo b/pkg/app/testdata/app_diff_test_1/delete_foo_and_bar_when_bar_needs_foo index db62f332..c623786d 100644 --- a/pkg/app/testdata/app_diff_test_1/delete_foo_and_bar_when_bar_needs_foo +++ b/pkg/app/testdata/app_diff_test_1/delete_foo_and_bar_when_bar_needs_foo @@ -34,7 +34,6 @@ second-pass rendering result of "helmfile.yaml.part.0": 10: merged environment: &{default map[] map[]} -WARNING: release bar needs foo, but foo is not installed due to installed: false. Either mark foo as installed or remove foo from bar's needs 2 release(s) found in helmfile.yaml Affected releases are: diff --git a/pkg/app/testdata/app_diff_test_1/delete_foo_and_bar_when_foo_needs_bar b/pkg/app/testdata/app_diff_test_1/delete_foo_and_bar_when_foo_needs_bar index 7268940e..08a2d361 100644 --- a/pkg/app/testdata/app_diff_test_1/delete_foo_and_bar_when_foo_needs_bar +++ b/pkg/app/testdata/app_diff_test_1/delete_foo_and_bar_when_foo_needs_bar @@ -34,7 +34,6 @@ second-pass rendering result of "helmfile.yaml.part.0": 10: merged environment: &{default map[] map[]} -WARNING: release foo needs bar, but bar is not installed due to installed: false. Either mark bar as installed or remove bar from foo's needs 2 release(s) found in helmfile.yaml Affected releases are: diff --git a/pkg/app/testdata/app_diff_test_1/smoke b/pkg/app/testdata/app_diff_test_1/smoke index 3cd9cd5a..37e7141b 100644 --- a/pkg/app/testdata/app_diff_test_1/smoke +++ b/pkg/app/testdata/app_diff_test_1/smoke @@ -122,7 +122,6 @@ second-pass rendering result of "helmfile.yaml.part.0": 54: merged environment: &{default map[] map[]} -WARNING: release frontend-v1 needs backend-v1, but backend-v1 is not installed due to installed: false. Either mark backend-v1 as installed or remove backend-v1 from frontend-v1's needs 10 release(s) found in helmfile.yaml processing 5 groups of releases in this order: diff --git a/pkg/app/testdata/app_diff_test_2/delete_foo_and_bar_when_bar_needs_foo b/pkg/app/testdata/app_diff_test_2/delete_foo_and_bar_when_bar_needs_foo index db62f332..c623786d 100644 --- a/pkg/app/testdata/app_diff_test_2/delete_foo_and_bar_when_bar_needs_foo +++ b/pkg/app/testdata/app_diff_test_2/delete_foo_and_bar_when_bar_needs_foo @@ -34,7 +34,6 @@ second-pass rendering result of "helmfile.yaml.part.0": 10: merged environment: &{default map[] map[]} -WARNING: release bar needs foo, but foo is not installed due to installed: false. Either mark foo as installed or remove foo from bar's needs 2 release(s) found in helmfile.yaml Affected releases are: diff --git a/pkg/app/testdata/app_diff_test_2/delete_foo_and_bar_when_foo_needs_bar b/pkg/app/testdata/app_diff_test_2/delete_foo_and_bar_when_foo_needs_bar index 7268940e..08a2d361 100644 --- a/pkg/app/testdata/app_diff_test_2/delete_foo_and_bar_when_foo_needs_bar +++ b/pkg/app/testdata/app_diff_test_2/delete_foo_and_bar_when_foo_needs_bar @@ -34,7 +34,6 @@ second-pass rendering result of "helmfile.yaml.part.0": 10: merged environment: &{default map[] map[]} -WARNING: release foo needs bar, but bar is not installed due to installed: false. Either mark bar as installed or remove bar from foo's needs 2 release(s) found in helmfile.yaml Affected releases are: diff --git a/pkg/app/testdata/app_diff_test_2/smoke b/pkg/app/testdata/app_diff_test_2/smoke index fcaf8164..736c9795 100644 --- a/pkg/app/testdata/app_diff_test_2/smoke +++ b/pkg/app/testdata/app_diff_test_2/smoke @@ -122,7 +122,6 @@ second-pass rendering result of "helmfile.yaml.part.0": 54: merged environment: &{default map[] map[]} -WARNING: release frontend-v1 needs backend-v1, but backend-v1 is not installed due to installed: false. Either mark backend-v1 as installed or remove backend-v1 from frontend-v1's needs 10 release(s) found in helmfile.yaml processing 5 groups of releases in this order: diff --git a/pkg/app/testdata/testapply/delete_foo_and_bar_when_bar_needs_foo/log b/pkg/app/testdata/testapply/delete_foo_and_bar_when_bar_needs_foo/log index f3377bd1..51419ddc 100644 --- a/pkg/app/testdata/testapply/delete_foo_and_bar_when_bar_needs_foo/log +++ b/pkg/app/testdata/testapply/delete_foo_and_bar_when_bar_needs_foo/log @@ -34,7 +34,6 @@ second-pass rendering result of "helmfile.yaml.part.0": 10: merged environment: &{default map[] map[]} -WARNING: release bar needs foo, but foo is not installed due to installed: false. Either mark foo as installed or remove foo from bar's needs 2 release(s) found in helmfile.yaml Affected releases are: diff --git a/pkg/app/testdata/testapply/delete_foo_and_bar_when_foo_needs_bar/log b/pkg/app/testdata/testapply/delete_foo_and_bar_when_foo_needs_bar/log index e8850438..a71e2744 100644 --- a/pkg/app/testdata/testapply/delete_foo_and_bar_when_foo_needs_bar/log +++ b/pkg/app/testdata/testapply/delete_foo_and_bar_when_foo_needs_bar/log @@ -34,7 +34,6 @@ second-pass rendering result of "helmfile.yaml.part.0": 10: merged environment: &{default map[] map[]} -WARNING: release foo needs bar, but bar is not installed due to installed: false. Either mark bar as installed or remove bar from foo's needs 2 release(s) found in helmfile.yaml Affected releases are: diff --git a/pkg/app/testdata/testapply/smoke/log b/pkg/app/testdata/testapply/smoke/log index 6ef2316c..3745034a 100644 --- a/pkg/app/testdata/testapply/smoke/log +++ b/pkg/app/testdata/testapply/smoke/log @@ -122,7 +122,6 @@ second-pass rendering result of "helmfile.yaml.part.0": 54: merged environment: &{default map[] map[]} -WARNING: release frontend-v1 needs backend-v1, but backend-v1 is not installed due to installed: false. Either mark backend-v1 as installed or remove backend-v1 from frontend-v1's needs 10 release(s) found in helmfile.yaml Affected releases are: diff --git a/pkg/app/testdata/testdestroy/destroy_only_one_release_with_selector/log b/pkg/app/testdata/testdestroy/destroy_only_one_release_with_selector/log index b3ea59f1..8e164254 100644 --- a/pkg/app/testdata/testdestroy/destroy_only_one_release_with_selector/log +++ b/pkg/app/testdata/testdestroy/destroy_only_one_release_with_selector/log @@ -122,7 +122,6 @@ second-pass rendering result of "helmfile.yaml.part.0": 54: merged environment: &{default map[] map[]} -WARNING: release frontend-v1 needs backend-v1, but backend-v1 is not installed due to installed: false. Either mark backend-v1 as installed or remove backend-v1 from frontend-v1's needs 1 release(s) matching name=logging found in helmfile.yaml processing 1 groups of releases in this order: diff --git a/pkg/app/testdata/testdestroy/smoke/log b/pkg/app/testdata/testdestroy/smoke/log index 13a80305..0c5d84fe 100644 --- a/pkg/app/testdata/testdestroy/smoke/log +++ b/pkg/app/testdata/testdestroy/smoke/log @@ -122,7 +122,6 @@ second-pass rendering result of "helmfile.yaml.part.0": 54: merged environment: &{default map[] map[]} -WARNING: release frontend-v1 needs backend-v1, but backend-v1 is not installed due to installed: false. Either mark backend-v1 as installed or remove backend-v1 from frontend-v1's needs 10 release(s) found in helmfile.yaml processing 5 groups of releases in this order: @@ -136,7 +135,6 @@ GROUP RELEASES processing releases in group 1/5: default//frontend-v3, default//frontend-v2, default//frontend-v1 release "frontend-v3" processed release "frontend-v2" processed -WARNING: release frontend-v1 needs backend-v1, but backend-v1 is not installed due to installed: false. Either mark backend-v1 as installed or remove backend-v1 from frontend-v1's needs release "frontend-v1" processed processing releases in group 2/5: default//backend-v2, default//backend-v1 release "backend-v2" processed diff --git a/pkg/app/testdata/testdestroy_2/destroy_only_one_release_with_selector/log b/pkg/app/testdata/testdestroy_2/destroy_only_one_release_with_selector/log index 917d5684..df88f3de 100644 --- a/pkg/app/testdata/testdestroy_2/destroy_only_one_release_with_selector/log +++ b/pkg/app/testdata/testdestroy_2/destroy_only_one_release_with_selector/log @@ -122,7 +122,6 @@ second-pass rendering result of "helmfile.yaml.part.0": 54: merged environment: &{default map[] map[]} -WARNING: release frontend-v1 needs backend-v1, but backend-v1 is not installed due to installed: false. Either mark backend-v1 as installed or remove backend-v1 from frontend-v1's needs 1 release(s) matching name=logging found in helmfile.yaml processing 1 groups of releases in this order: diff --git a/pkg/app/testdata/testdestroy_2/smoke/log b/pkg/app/testdata/testdestroy_2/smoke/log index d4fd6427..007a08ef 100644 --- a/pkg/app/testdata/testdestroy_2/smoke/log +++ b/pkg/app/testdata/testdestroy_2/smoke/log @@ -122,7 +122,6 @@ second-pass rendering result of "helmfile.yaml.part.0": 54: merged environment: &{default map[] map[]} -WARNING: release frontend-v1 needs backend-v1, but backend-v1 is not installed due to installed: false. Either mark backend-v1 as installed or remove backend-v1 from frontend-v1's needs 10 release(s) found in helmfile.yaml processing 5 groups of releases in this order: @@ -136,7 +135,6 @@ GROUP RELEASES processing releases in group 1/5: frontend-v3, frontend-v2, frontend-v1 release "frontend-v3" processed release "frontend-v2" processed -WARNING: release frontend-v1 needs backend-v1, but backend-v1 is not installed due to installed: false. Either mark backend-v1 as installed or remove backend-v1 from frontend-v1's needs release "frontend-v1" processed processing releases in group 2/5: backend-v2, backend-v1 release "backend-v2" processed diff --git a/pkg/state/state.go b/pkg/state/state.go index 22f619c3..223cee8c 100644 --- a/pkg/state/state.go +++ b/pkg/state/state.go @@ -502,7 +502,7 @@ func (st *HelmState) reformat(spec *ReleaseSpec) []string { components := strings.Split(n, "/") name = components[len(components)-1] - if !releaseInstalledInfo[name] { + if spec.Desired() && !releaseInstalledInfo[name] { st.logger.Warnf("WARNING: %s", fmt.Sprintf("release %s needs %s, but %s is not installed due to installed: false. Either mark %s as installed or remove %s from %s's needs", spec.Name, name, name, name, name, spec.Name)) }