diff --git a/pkg/app/testdata/app_diff_test/include-needs_should_not_fail_on_disabled_direct_need b/pkg/app/testdata/app_diff_test/include-needs_should_not_fail_on_disabled_direct_need index b6c63520..11b5a896 100644 --- a/pkg/app/testdata/app_diff_test/include-needs_should_not_fail_on_disabled_direct_need +++ b/pkg/app/testdata/app_diff_test/include-needs_should_not_fail_on_disabled_direct_need @@ -8,6 +8,3 @@ GROUP RELEASES processing releases in group 1/1: default//test2 WARNING: release test2 needs disabled, but disabled is not installed due to installed: false. Either mark disabled as installed or remove disabled from test2's needs -Affected releases are: - disabled (incubator/raw) DELETED - diff --git a/pkg/app/testdata/testapply_2/skip-needs=false_include-needs=true_with_installed_but_disabled_release/log b/pkg/app/testdata/testapply_2/skip-needs=false_include-needs=true_with_installed_but_disabled_release/log index ba53e9af..d0d92835 100644 --- a/pkg/app/testdata/testapply_2/skip-needs=false_include-needs=true_with_installed_but_disabled_release/log +++ b/pkg/app/testdata/testapply_2/skip-needs=false_include-needs=true_with_installed_but_disabled_release/log @@ -33,27 +33,15 @@ WARNING: release external-secrets needs kubernetes-external-secrets, but kuberne WARNING: release external-secrets needs kubernetes-external-secrets, but kubernetes-external-secrets is not installed due to installed: false. Either mark kubernetes-external-secrets as installed or remove kubernetes-external-secrets from external-secrets's needs Affected releases are: external-secrets (incubator/raw) UPDATED - kubernetes-external-secrets (incubator/raw) DELETED my-release (incubator/raw) UPDATED -invoking preapply hooks for 3 groups of releases in this order: +invoking preapply hooks for 2 groups of releases in this order: GROUP RELEASES 1 default/default/my-release 2 default/default/external-secrets -3 default/kube-system/kubernetes-external-secrets -invoking preapply hooks for releases in group 1/3: default/default/my-release -invoking preapply hooks for releases in group 2/3: default/default/external-secrets -invoking preapply hooks for releases in group 3/3: default/kube-system/kubernetes-external-secrets -processing 3 groups of releases in this order: -GROUP RELEASES -1 default/default/my-release -2 default/default/external-secrets -3 default/kube-system/kubernetes-external-secrets - -processing releases in group 1/3: default/default/my-release -processing releases in group 2/3: default/default/external-secrets -processing releases in group 3/3: default/kube-system/kubernetes-external-secrets +invoking preapply hooks for releases in group 1/2: default/default/my-release +invoking preapply hooks for releases in group 2/2: default/default/external-secrets processing 2 groups of releases in this order: GROUP RELEASES 1 default/default/external-secrets @@ -68,8 +56,3 @@ NAME NAMESPACE CHART VERSION DURATION external-secrets default incubator/raw 3.1.0 0s my-release default incubator/raw 3.1.0 0s - -DELETED RELEASES: -NAME NAMESPACE DURATION -kubernetes-external-secrets kube-system 0s - diff --git a/pkg/app/testdata/testapply_2/skip-needs=false_include-needs=true_with_not_installed_and_disabled_release/log b/pkg/app/testdata/testapply_2/skip-needs=false_include-needs=true_with_not_installed_and_disabled_release/log index 58c602da..d0d92835 100644 --- a/pkg/app/testdata/testapply_2/skip-needs=false_include-needs=true_with_not_installed_and_disabled_release/log +++ b/pkg/app/testdata/testapply_2/skip-needs=false_include-needs=true_with_not_installed_and_disabled_release/log @@ -35,15 +35,13 @@ Affected releases are: external-secrets (incubator/raw) UPDATED my-release (incubator/raw) UPDATED -invoking preapply hooks for 3 groups of releases in this order: +invoking preapply hooks for 2 groups of releases in this order: GROUP RELEASES 1 default/default/my-release 2 default/default/external-secrets -3 default/kube-system/kubernetes-external-secrets -invoking preapply hooks for releases in group 1/3: default/default/my-release -invoking preapply hooks for releases in group 2/3: default/default/external-secrets -invoking preapply hooks for releases in group 3/3: default/kube-system/kubernetes-external-secrets +invoking preapply hooks for releases in group 1/2: default/default/my-release +invoking preapply hooks for releases in group 2/2: default/default/external-secrets processing 2 groups of releases in this order: GROUP RELEASES 1 default/default/external-secrets diff --git a/pkg/app/testdata/testapply_3/skip-needs=false_include-needs=true_with_installed_but_disabled_release/log b/pkg/app/testdata/testapply_3/skip-needs=false_include-needs=true_with_installed_but_disabled_release/log index 06963ad6..a603737b 100644 --- a/pkg/app/testdata/testapply_3/skip-needs=false_include-needs=true_with_installed_but_disabled_release/log +++ b/pkg/app/testdata/testapply_3/skip-needs=false_include-needs=true_with_installed_but_disabled_release/log @@ -33,27 +33,15 @@ WARNING: release external-secrets needs kubernetes-external-secrets, but kuberne WARNING: release external-secrets needs kubernetes-external-secrets, but kubernetes-external-secrets is not installed due to installed: false. Either mark kubernetes-external-secrets as installed or remove kubernetes-external-secrets from external-secrets's needs Affected releases are: external-secrets (incubator/raw) UPDATED - kubernetes-external-secrets (incubator/raw) DELETED my-release (incubator/raw) UPDATED -invoking preapply hooks for 3 groups of releases in this order: +invoking preapply hooks for 2 groups of releases in this order: GROUP RELEASES 1 default/my-release 2 default/external-secrets -3 kube-system/kubernetes-external-secrets -invoking preapply hooks for releases in group 1/3: default/my-release -invoking preapply hooks for releases in group 2/3: default/external-secrets -invoking preapply hooks for releases in group 3/3: kube-system/kubernetes-external-secrets -processing 3 groups of releases in this order: -GROUP RELEASES -1 default/my-release -2 default/external-secrets -3 kube-system/kubernetes-external-secrets - -processing releases in group 1/3: default/my-release -processing releases in group 2/3: default/external-secrets -processing releases in group 3/3: kube-system/kubernetes-external-secrets +invoking preapply hooks for releases in group 1/2: default/my-release +invoking preapply hooks for releases in group 2/2: default/external-secrets processing 2 groups of releases in this order: GROUP RELEASES 1 default/external-secrets @@ -68,8 +56,3 @@ NAME NAMESPACE CHART VERSION DURATION external-secrets default incubator/raw 3.1.0 0s my-release default incubator/raw 3.1.0 0s - -DELETED RELEASES: -NAME NAMESPACE DURATION -kubernetes-external-secrets kube-system 0s - diff --git a/pkg/app/testdata/testapply_3/skip-needs=false_include-needs=true_with_not_installed_and_disabled_release/log b/pkg/app/testdata/testapply_3/skip-needs=false_include-needs=true_with_not_installed_and_disabled_release/log index b67a15d7..a603737b 100644 --- a/pkg/app/testdata/testapply_3/skip-needs=false_include-needs=true_with_not_installed_and_disabled_release/log +++ b/pkg/app/testdata/testapply_3/skip-needs=false_include-needs=true_with_not_installed_and_disabled_release/log @@ -35,15 +35,13 @@ Affected releases are: external-secrets (incubator/raw) UPDATED my-release (incubator/raw) UPDATED -invoking preapply hooks for 3 groups of releases in this order: +invoking preapply hooks for 2 groups of releases in this order: GROUP RELEASES 1 default/my-release 2 default/external-secrets -3 kube-system/kubernetes-external-secrets -invoking preapply hooks for releases in group 1/3: default/my-release -invoking preapply hooks for releases in group 2/3: default/external-secrets -invoking preapply hooks for releases in group 3/3: kube-system/kubernetes-external-secrets +invoking preapply hooks for releases in group 1/2: default/my-release +invoking preapply hooks for releases in group 2/2: default/external-secrets processing 2 groups of releases in this order: GROUP RELEASES 1 default/external-secrets diff --git a/pkg/state/state.go b/pkg/state/state.go index 0c5cc2e4..9bc52027 100644 --- a/pkg/state/state.go +++ b/pkg/state/state.go @@ -3077,7 +3077,9 @@ func unmarkReleasesByNeedID(toUnmark map[string]struct{}, releases []Release) { for i := range releases { releaseID := ReleaseToID(&releases[i].ReleaseSpec) if _, ok := toUnmark[releaseID]; ok { - releases[i].Filtered = false + if releases[i].Desired() { + releases[i].Filtered = false + } } } }