From 3e2285ea72da8099cf53f1bdb26d3b46ed6662cb Mon Sep 17 00:00:00 2001 From: Yusuke Kuoka Date: Mon, 10 Oct 2022 13:22:30 +0000 Subject: [PATCH] fixup! fixup! fixup! fixup! fixup! fixup! Fix preapply hook behavior Signed-off-by: Yusuke Kuoka --- pkg/app/app_apply_test.go | 83 ----------------- .../log | 91 +++++++++++++++++++ 2 files changed, 91 insertions(+), 83 deletions(-) create mode 100644 pkg/app/testdata/testapply_2/skip-needs=false_include-needs=true_but_no_diff_on_needed_release/log diff --git a/pkg/app/app_apply_test.go b/pkg/app/app_apply_test.go index d752825f..9d1876ba 100644 --- a/pkg/app/app_apply_test.go +++ b/pkg/app/app_apply_test.go @@ -378,89 +378,6 @@ my-release 4 Fri Nov 1 08:40:07 2019 DEPLOYED raw-3.1.0 3.1.0 def }, // as we check for log output, set concurrency to 1 to avoid non-deterministic test result concurrency: 1, - log: `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: - 2: - 3: releases: - 4: - name: kubernetes-external-secrets - 5: chart: incubator/raw - 6: namespace: kube-system - 7: - 8: - name: external-secrets - 9: chart: incubator/raw -10: namespace: default -11: labels: -12: app: test -13: needs: -14: - kube-system/kubernetes-external-secrets -15: -16: - name: my-release -17: chart: incubator/raw -18: namespace: default -19: labels: -20: app: test -21: needs: -22: - default/external-secrets -23: - -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: - 2: - 3: releases: - 4: - name: kubernetes-external-secrets - 5: chart: incubator/raw - 6: namespace: kube-system - 7: - 8: - name: external-secrets - 9: chart: incubator/raw -10: namespace: default -11: labels: -12: app: test -13: needs: -14: - kube-system/kubernetes-external-secrets -15: -16: - name: my-release -17: chart: incubator/raw -18: namespace: default -19: labels: -20: app: test -21: needs: -22: - default/external-secrets -23: - -merged environment: &{default map[] map[]} -2 release(s) matching app=test found in helmfile.yaml - -Affected releases are: - external-secrets (incubator/raw) UPDATED - my-release (incubator/raw) UPDATED - -processing 2 groups of releases in this order: -GROUP RELEASES -1 default/default/external-secrets -2 default/default/my-release - -processing releases in group 1/2: default/default/external-secrets -processing releases in group 2/2: default/default/my-release - -UPDATED RELEASES: -NAME CHART VERSION -external-secrets incubator/raw 3.1.0 -my-release incubator/raw 3.1.0 - -changing working directory back to "/path/to" -`, }) }) diff --git a/pkg/app/testdata/testapply_2/skip-needs=false_include-needs=true_but_no_diff_on_needed_release/log b/pkg/app/testdata/testapply_2/skip-needs=false_include-needs=true_but_no_diff_on_needed_release/log new file mode 100644 index 00000000..9944d926 --- /dev/null +++ b/pkg/app/testdata/testapply_2/skip-needs=false_include-needs=true_but_no_diff_on_needed_release/log @@ -0,0 +1,91 @@ +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: + 2: + 3: releases: + 4: - name: kubernetes-external-secrets + 5: chart: incubator/raw + 6: namespace: kube-system + 7: + 8: - name: external-secrets + 9: chart: incubator/raw +10: namespace: default +11: labels: +12: app: test +13: needs: +14: - kube-system/kubernetes-external-secrets +15: +16: - name: my-release +17: chart: incubator/raw +18: namespace: default +19: labels: +20: app: test +21: needs: +22: - default/external-secrets +23: + +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: + 2: + 3: releases: + 4: - name: kubernetes-external-secrets + 5: chart: incubator/raw + 6: namespace: kube-system + 7: + 8: - name: external-secrets + 9: chart: incubator/raw +10: namespace: default +11: labels: +12: app: test +13: needs: +14: - kube-system/kubernetes-external-secrets +15: +16: - name: my-release +17: chart: incubator/raw +18: namespace: default +19: labels: +20: app: test +21: needs: +22: - default/external-secrets +23: + +merged environment: &{default map[] map[]} +2 release(s) matching app=test found in helmfile.yaml + +Affected releases are: + external-secrets (incubator/raw) UPDATED + my-release (incubator/raw) UPDATED + +invoking preapply hooks for 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 + +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 2 groups of releases in this order: +GROUP RELEASES +1 default/default/external-secrets +2 default/default/my-release + +processing releases in group 1/2: default/default/external-secrets +processing releases in group 2/2: default/default/my-release + +UPDATED RELEASES: +NAME CHART VERSION +external-secrets incubator/raw 3.1.0 +my-release incubator/raw 3.1.0 + +changing working directory back to "/path/to"