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

pkg/app/testdata/testapply/helm-status-check-to-release-existence/log

@@ -2,8 +2,3 @@ merged environment: &{default  map[] map[] map[]}
 2 release(s) found in helmfile.yaml
 
 Checking release existence using `helm status` for release foo_notFound
-invoking preapply hooks for 1 groups of releases in this order:
-GROUP RELEASES
-1     default//bar, default//foo_notFound
-
-invoking preapply hooks for releases in group 1/1: default//bar, default//foo_notFound

pkg/app/testdata/testapply/noop/log

@@ -1,10 +1,3 @@
 merged environment: &{default  map[] map[] map[]}
 2 release(s) found in helmfile.yaml
 
-invoking preapply hooks for 2 groups of releases in this order:
-GROUP RELEASES
-1     default//foo
-2     default//bar
-
-invoking preapply hooks for releases in group 1/2: default//foo
-invoking preapply hooks for releases in group 2/2: default//bar

pkg/app/testdata/testapply_2/timeout_flag_is_passed_to_helm/log

@@ -0,0 +1,21 @@
+merged environment: &{default  map[] map[] map[]}
+1 release(s) found in helmfile.yaml
+
+Affected releases are:
+  my-release (incubator/raw) UPDATED
+
+invoking preapply hooks for 1 groups of releases in this order:
+GROUP RELEASES
+1     default/default/my-release
+
+invoking preapply hooks for releases in group 1/1: default/default/my-release
+processing 1 groups of releases in this order:
+GROUP RELEASES
+1     default/default/my-release
+
+processing releases in group 1/1: default/default/my-release
+
+UPDATED RELEASES:
+NAME         NAMESPACE   CHART           VERSION   DURATION
+my-release   default     incubator/raw   3.1.0           0s
+

pkg/app/testdata/testapply_hooks/hooks_for_no-diff_release/log

@@ -1,9 +1,3 @@
 
 hook[prepare] logs | foo
 hook[prepare] logs | 
-
-hook[preapply] logs | foo
-hook[preapply] logs | 
-
-hook[cleanup] logs | foo
-hook[cleanup] logs |