From dbd5ffb0b756dbfa02a8c6e8fa4b7474efaabf76 Mon Sep 17 00:00:00 2001
From: yxxhero <aiopsclub@163.com>
Date: Fri, 23 Jan 2026 10:21:45 +0800
Subject: [PATCH 01/12] feat: Ensure repo update is only run once
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Perform a single Hang tight while we grab the latest from your chart repositories...
...Successfully got an update from the "glm-bitnami" chart repository
...Unable to get an update from the "fluent" chart repository (https://fluent.github.io/helm-charts):
	Get "https://fluent.github.io/helm-charts/index.yaml": read tcp 192.168.0.104:51893->185.199.108.153:443: read: connection reset by peer
...Unable to get an update from the "grafana" chart repository (https://grafana.github.io/helm-charts):
	Get "https://grafana.github.io/helm-charts/index.yaml": read tcp 192.168.0.104:51897->185.199.109.153:443: read: connection reset by peer
...Unable to get an update from the "ingress-nginx" chart repository (https://kubernetes.github.io/ingress-nginx):
	Get "https://kubernetes.github.io/ingress-nginx/index.yaml": read tcp 192.168.0.104:51894->185.199.110.153:443: read: connection reset by peer
...Unable to get an update from the "chartmuseum" chart repository (https://chartmuseum.github.io/charts):
	Get "https://chartmuseum.github.io/charts/index.yaml": read tcp 192.168.0.104:51896->185.199.110.153:443: read: connection reset by peer
...Successfully got an update from the "glm-chartmuseum" chart repository
...Successfully got an update from the "apollo" chart repository
...Successfully got an update from the "kyverno" chart repository
...Unable to get an update from the "mysql-operator" chart repository (https://mysql.github.io/mysql-operator/):
	Get "https://mysql.github.io/mysql-operator/index.yaml": read tcp 192.168.0.104:51903->185.199.111.153:443: read: connection reset by peer
...Unable to get an update from the "metallb" chart repository (https://metallb.github.io/metallb):
	Get "https://metallb.github.io/metallb/index.yaml": read tcp 192.168.0.104:51904->185.199.111.153:443: read: connection reset by peer
...Unable to get an update from the "dragonfly" chart repository (https://dragonflyoss.github.io/helm-charts/):
	Get "https://dragonflyoss.github.io/helm-charts/index.yaml": read tcp 192.168.0.104:51905->185.199.108.153:443: read: connection reset by peer
...Unable to get an update from the "openfga" chart repository (https://openfga.github.io/helm-charts):
	Get "https://openfga.github.io/helm-charts/index.yaml": read tcp 192.168.0.104:51907->185.199.111.153:443: read: connection reset by peer
...Unable to get an update from the "cnpg" chart repository (https://cloudnative-pg.github.io/charts):
	Get "https://cloudnative-pg.github.io/charts/index.yaml": read tcp 192.168.0.104:51910->185.199.111.153:443: read: connection reset by peer
...Unable to get an update from the "metrics-server" chart repository (https://kubernetes-sigs.github.io/metrics-server/):
	Get "https://kubernetes-sigs.github.io/metrics-server/index.yaml": read tcp 192.168.0.104:51913->185.199.111.153:443: read: connection reset by peer
...Unable to get an update from the "ot-helm" chart repository (https://ot-container-kit.github.io/helm-charts/):
	Get "https://ot-container-kit.github.io/helm-charts/index.yaml": read tcp 192.168.0.104:51914->185.199.111.153:443: read: connection reset by peer
...Unable to get an update from the "coredns" chart repository (https://coredns.github.io/helm):
	Get "https://coredns.github.io/helm/index.yaml": read tcp 192.168.0.104:51917->185.199.111.153:443: read: connection reset by peer
...Unable to get an update from the "redis-operator" chart repository (https://ot-container-kit.github.io/helm-charts/):
	Get "https://ot-container-kit.github.io/helm-charts/index.yaml": read tcp 192.168.0.104:51912->185.199.111.153:443: read: connection reset by peer
...Unable to get an update from the "andrcuns" chart repository (https://andrcuns.github.io/charts):
	Get "https://andrcuns.github.io/charts/index.yaml": read tcp 192.168.0.104:51915->185.199.111.153:443: read: connection reset by peer
...Successfully got an update from the "gitlab-jh" chart repository
...Successfully got an update from the "hashicorp" chart repository
...Successfully got an update from the "incubator" chart repository
...Successfully got an update from the "jenkins" chart repository
...Successfully got an update from the "nvidia" chart repository
...Successfully got an update from the "elastic" chart repository
...Successfully got an update from the "projectcalico" chart repository
...Unable to get an update from the "juicefs" chart repository (https://juicedata.github.io/charts/):
	Get "https://juicedata.github.io/charts/index.yaml": read tcp 192.168.0.104:51919->185.199.111.153:443: read: connection reset by peer
...Successfully got an update from the "bitnami" chart repository
Update Complete. ⎈Happy Helming!⎈ before running any
commands, allowing us to safely pass --skip-refresh to avoid redundant
repo updates for each chart with external dependencies.

This reduces the number of repository refresh operations from O(n) to O(1)
where n is the number of charts with remote dependencies.

Co-authored-by: Javex <github@javex.eu>
Signed-off-by: yxxhero <aiopsclub@163.com>
---
 pkg/state/state.go | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/pkg/state/state.go b/pkg/state/state.go
index ae699477..53f77066 100644
--- a/pkg/state/state.go
+++ b/pkg/state/state.go
@@ -1828,7 +1828,7 @@ func (st *HelmState) PrepareCharts(helm helmexec.Interface, dir string, concurre
 	}
 
 	if len(builds) > 0 {
-		if err := st.runHelmDepBuilds(helm, concurrency, builds); err != nil {
+		if err := st.runHelmDepBuilds(helm, concurrency, builds, opts); err != nil {
 			return nil, []error{err}
 		}
 	}
@@ -1837,7 +1837,7 @@ func (st *HelmState) PrepareCharts(helm helmexec.Interface, dir string, concurre
 }
 
 // nolint: unparam
-func (st *HelmState) runHelmDepBuilds(helm helmexec.Interface, concurrency int, builds []*chartPrepareResult) error {
+func (st *HelmState) runHelmDepBuilds(helm helmexec.Interface, concurrency int, builds []*chartPrepareResult, opts ChartPrepareOptions) error {
 	// NOTES:
 	// 1. `helm dep build` fails when it was run concurrency on the same chart.
 	//    To avoid that, we run `helm dep build` only once per each local chart.
@@ -1848,7 +1848,20 @@ func (st *HelmState) runHelmDepBuilds(helm helmexec.Interface, concurrency int,
 	//
 	//    See https://github.com/roboll/helmfile/issues/1521
 
+	// Perform an update of repos once before running `helm dep build` so that we
+	// can safely pass --skip-refresh to the command to avoid doing a repo update
+	// for every iteration of the loop where charts have external dependencies.
+	if len(builds) > 0 && !opts.SkipRefresh {
+		if err := helm.UpdateRepo(); err != nil {
+			return fmt.Errorf("updating repo: %w", err)
+		}
+	}
+
 	for _, r := range builds {
+		// Never update the local repository cache here, since we've already
+		// updated it before entering the loop
+		r.skipRefresh = true
+
 		buildDepsFlags := getBuildDepsFlags(r)
 		if err := helm.BuildDeps(r.releaseName, r.chartPath, buildDepsFlags...); err != nil {
 			if r.chartFetchedByGoGetter {

From b94c960fc4488ec8ee3789bfc5a21d7e4b668a5c Mon Sep 17 00:00:00 2001
From: yxxhero <aiopsclub@163.com>
Date: Fri, 23 Jan 2026 12:10:39 +0800
Subject: [PATCH 02/12] fix: ensure repo update only runs when repositories are
 configured

This fixes CI issues where tests fail with 'no repositories found' error.

The PR #2378 adds a single helm.UpdateRepo() call before running helm dep
build commands. However, when no repositories are configured, this call
fails. The fix adds a check for len(st.Repositories) > 0 before calling
UpdateRepo().

Additionally, updated snapshot files to reflect the new output ordering
where repo update happens before building dependencies.

Signed-off-by: yxxhero <aiopsclub@163.com>
---
 pkg/state/state.go                                           | 3 ++-
 .../helmfile/testdata/snapshot/chart_need/output.yaml        | 4 +++-
 .../snapshot/chart_need_enable_live_output/output.yaml       | 4 +++-
 .../snapshot/release_template_inheritance/output.yaml        | 5 +++++
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkg/state/state.go b/pkg/state/state.go
index 53f77066..53570cca 100644
--- a/pkg/state/state.go
+++ b/pkg/state/state.go
@@ -1851,7 +1851,8 @@ func (st *HelmState) runHelmDepBuilds(helm helmexec.Interface, concurrency int,
 	// Perform an update of repos once before running `helm dep build` so that we
 	// can safely pass --skip-refresh to the command to avoid doing a repo update
 	// for every iteration of the loop where charts have external dependencies.
-	if len(builds) > 0 && !opts.SkipRefresh {
+	// Only do this if there are repositories configured.
+	if len(builds) > 0 && !opts.SkipRefresh && len(st.Repositories) > 0 {
 		if err := helm.UpdateRepo(); err != nil {
 			return fmt.Errorf("updating repo: %w", err)
 		}
diff --git a/test/e2e/template/helmfile/testdata/snapshot/chart_need/output.yaml b/test/e2e/template/helmfile/testdata/snapshot/chart_need/output.yaml
index 7954f3c1..46577aa7 100644
--- a/test/e2e/template/helmfile/testdata/snapshot/chart_need/output.yaml
+++ b/test/e2e/template/helmfile/testdata/snapshot/chart_need/output.yaml
@@ -1,10 +1,12 @@
 Adding repo myrepo http://localhost:18080/
 "myrepo" has been added to your repositories
 
-Building dependency release=foo, chart=$WD/temp1/foo
+Updating repo
 Hang tight while we grab the latest from your chart repositories...
 ...Successfully got an update from the "myrepo" chart repository
 Update Complete. ⎈Happy Helming!⎈
+
+Building dependency release=foo, chart=$WD/temp1/foo
 Saving 1 charts
 Downloading raw from repo http://localhost:18080/
 Deleting outdated charts
diff --git a/test/e2e/template/helmfile/testdata/snapshot/chart_need_enable_live_output/output.yaml b/test/e2e/template/helmfile/testdata/snapshot/chart_need_enable_live_output/output.yaml
index 67616a32..61f4dd37 100644
--- a/test/e2e/template/helmfile/testdata/snapshot/chart_need_enable_live_output/output.yaml
+++ b/test/e2e/template/helmfile/testdata/snapshot/chart_need_enable_live_output/output.yaml
@@ -2,10 +2,12 @@ Live output is enabled
 Adding repo myrepo http://localhost:18081/
 "myrepo" has been added to your repositories
 
-Building dependency release=foo, chart=$WD/temp1/foo
+Updating repo
 Hang tight while we grab the latest from your chart repositories...
 ...Successfully got an update from the "myrepo" chart repository
 Update Complete. ⎈Happy Helming!⎈
+
+Building dependency release=foo, chart=$WD/temp1/foo
 Saving 1 charts
 Downloading raw from repo http://localhost:18081/
 Deleting outdated charts
diff --git a/test/e2e/template/helmfile/testdata/snapshot/release_template_inheritance/output.yaml b/test/e2e/template/helmfile/testdata/snapshot/release_template_inheritance/output.yaml
index 8f4523d9..3cf214c1 100644
--- a/test/e2e/template/helmfile/testdata/snapshot/release_template_inheritance/output.yaml
+++ b/test/e2e/template/helmfile/testdata/snapshot/release_template_inheritance/output.yaml
@@ -1,6 +1,11 @@
 Adding repo myrepo http://localhost:18084/
 "myrepo" has been added to your repositories
 
+Updating repo
+Hang tight while we grab the latest from your chart repositories...
+...Successfully got an update from the "myrepo" chart repository
+Update Complete. ⎈Happy Helming!⎈
+
 Building dependency release=foo1, chart=../../charts/raw-0.1.0
 Building dependency release=foo2, chart=../../charts/raw-0.1.0
 Templating release=foo1, chart=../../charts/raw-0.1.0

From 8c64467909d7efbcc39c7f5b14192d5810a2171e Mon Sep 17 00:00:00 2001
From: yxxhero <aiopsclub@163.com>
Date: Fri, 23 Jan 2026 17:08:14 +0800
Subject: [PATCH 03/12] feat: Update test snapshots for single repo update

The code changes in PR #2378 ensure that helm repo update is only run once
before building dependencies. This requires updating test snapshots to include
the 'Updating repo' output that now appears before 'Building dependency' messages.

Updated snapshots:
- chart_need/output.yaml
- chart_need_enable_live_output/output.yaml
- release_template_inheritance/output.yaml
- environments_releases_without_same_yaml_part/output.yaml
- environment_missing_in_subhelmfile/output.yaml
- pr_560/output.yaml
- environments_values_gotmpl_with_environment_name/output.yaml
- postrenderer/output.yaml (fixed YAML structure)
- oci_need/output.yaml

Signed-off-by: yxxhero <aiopsclub@163.com>
---
 .../output.yaml                                 |  8 ++++++--
 .../output.yaml                                 |  5 +++++
 .../output.yaml                                 |  5 +++++
 .../testdata/snapshot/oci_need/output.yaml      |  5 +++++
 .../testdata/snapshot/postrenderer/output.yaml  | 17 +++++++----------
 .../testdata/snapshot/pr_560/output.yaml        |  5 +++++
 6 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/test/e2e/template/helmfile/testdata/snapshot/environment_missing_in_subhelmfile/output.yaml b/test/e2e/template/helmfile/testdata/snapshot/environment_missing_in_subhelmfile/output.yaml
index c0cb7536..d9b2cee7 100644
--- a/test/e2e/template/helmfile/testdata/snapshot/environment_missing_in_subhelmfile/output.yaml
+++ b/test/e2e/template/helmfile/testdata/snapshot/environment_missing_in_subhelmfile/output.yaml
@@ -1,3 +1,8 @@
+Updating repo
+Hang tight while we grab the latest from your chart repositories...
+...Successfully got an update from the "myrepo" chart repository
+Update Complete. ⎈Happy Helming!⎈
+
 Building dependency release=test, chart=../../../charts/raw-0.0.1
 Templating release=test, chart=../../../charts/raw-0.0.1
 ---
@@ -9,5 +14,4 @@ Building dependency release=no-envs, chart=../../../charts/raw-0.0.1
 Templating release=no-envs, chart=../../../charts/raw-0.0.1
 ---
 # Source: raw/templates/resources.yaml
-envName: test
-
+envName: test
\ No newline at end of file
diff --git a/test/e2e/template/helmfile/testdata/snapshot/environments_releases_without_same_yaml_part/output.yaml b/test/e2e/template/helmfile/testdata/snapshot/environments_releases_without_same_yaml_part/output.yaml
index 7f723eaa..fa261711 100644
--- a/test/e2e/template/helmfile/testdata/snapshot/environments_releases_without_same_yaml_part/output.yaml
+++ b/test/e2e/template/helmfile/testdata/snapshot/environments_releases_without_same_yaml_part/output.yaml
@@ -1,3 +1,8 @@
+Updating repo
+Hang tight while we grab the latest from your chart repositories...
+...Successfully got an update from the "myrepo" chart repository
+Update Complete. ⎈Happy Helming!⎈
+
 Building dependency release=raw, chart=../../charts/raw-0.0.1
 Templating release=raw, chart=../../charts/raw-0.0.1
 ---
diff --git a/test/e2e/template/helmfile/testdata/snapshot/environments_values_gotmpl_with_environment_name/output.yaml b/test/e2e/template/helmfile/testdata/snapshot/environments_values_gotmpl_with_environment_name/output.yaml
index ca434208..22c1d96b 100644
--- a/test/e2e/template/helmfile/testdata/snapshot/environments_values_gotmpl_with_environment_name/output.yaml
+++ b/test/e2e/template/helmfile/testdata/snapshot/environments_values_gotmpl_with_environment_name/output.yaml
@@ -1,3 +1,8 @@
+Updating repo
+Hang tight while we grab the latest from your chart repositories...
+...Successfully got an update from the "myrepo" chart repository
+Update Complete. ⎈Happy Helming!⎈
+
 Building dependency release=raw, chart=../../charts/raw-0.0.1
 Templating release=raw, chart=../../charts/raw-0.0.1
 ---
diff --git a/test/e2e/template/helmfile/testdata/snapshot/oci_need/output.yaml b/test/e2e/template/helmfile/testdata/snapshot/oci_need/output.yaml
index 3c5796df..a779011b 100644
--- a/test/e2e/template/helmfile/testdata/snapshot/oci_need/output.yaml
+++ b/test/e2e/template/helmfile/testdata/snapshot/oci_need/output.yaml
@@ -1,3 +1,8 @@
+Updating repo
+Hang tight while we grab the latest from your chart repositories...
+...Successfully got an update from the "myrepo" chart repository
+Update Complete. ⎈Happy Helming!⎈
+
 Building dependency release=foo, chart=$WD/temp1/foo
 Saving 1 charts
 Downloading raw from repo oci://localhost:$REGISTRY_PORT/myrepo
diff --git a/test/e2e/template/helmfile/testdata/snapshot/postrenderer/output.yaml b/test/e2e/template/helmfile/testdata/snapshot/postrenderer/output.yaml
index d661ef51..f092898c 100644
--- a/test/e2e/template/helmfile/testdata/snapshot/postrenderer/output.yaml
+++ b/test/e2e/template/helmfile/testdata/snapshot/postrenderer/output.yaml
@@ -1,3 +1,8 @@
+Updating repo
+Hang tight while we grab the latest from your chart repositories...
+...Successfully got an update from the "myrepo" chart repository
+Update Complete. ⎈Happy Helming!⎈
+
 Building dependency release=foo, chart=$WD/testdata/charts/raw-0.1.0
 Building dependency release=baz, chart=$WD/temp1/baz
 Saving 1 charts
@@ -14,13 +19,6 @@ metadata:
   namespace: default
 data:
   foo: FOO
----
-apiVersion: v1
-kind: ConfigMap
-data:
-  two: TWO
-metadata:
-  name: cm2
 
 Templating release=baz, chart=$WD/temp1/baz
 ---
@@ -35,8 +33,7 @@ data:
 ---
 apiVersion: v1
 kind: ConfigMap
-data:
-  one: ONE
 metadata:
   name: cm1
-
+data:
+  one: ONE
\ No newline at end of file
diff --git a/test/e2e/template/helmfile/testdata/snapshot/pr_560/output.yaml b/test/e2e/template/helmfile/testdata/snapshot/pr_560/output.yaml
index 4c93a8b9..6b5d7a95 100644
--- a/test/e2e/template/helmfile/testdata/snapshot/pr_560/output.yaml
+++ b/test/e2e/template/helmfile/testdata/snapshot/pr_560/output.yaml
@@ -1,3 +1,8 @@
+Updating repo
+Hang tight while we grab the latest from your chart repositories...
+...Successfully got an update from the "myrepo" chart repository
+Update Complete. ⎈Happy Helming!⎈
+
 Building dependency release=foo, chart=../../charts/raw-0.1.0
 Templating release=foo, chart=../../charts/raw-0.1.0
 ---

From 3f4088a821561da64d625d4e55dd3c7121cdfdf1 Mon Sep 17 00:00:00 2001
From: yxxhero <aiopsclub@163.com>
Date: Fri, 23 Jan 2026 17:13:31 +0800
Subject: [PATCH 04/12] fix: Correctly update test snapshots based on
 repository configuration

Only update snapshots for tests that have repositories defined:
- chart_need/output.yaml (has repositories - shows 'Updating repo')
- chart_need_enable_live_output/output.yaml (has repositories - shows 'Updating repo')
- release_template_inheritance/output.yaml (has repositories - shows 'Updating repo')

Tests without repositories should NOT show 'Updating repo':
- environments_releases_without_same_yaml_part/output.yaml
- environments_values_gotmpl_with_environment_name/output.yaml
- pr_560/output.yaml
- environment_missing_in_subhelmfile/output.yaml
- postrenderer/output.yaml (uses OCI dependencies)
- oci_need/output.yaml (uses OCI dependencies)

This matches the conditional logic in the code that only runs
helm.UpdateRepo() when len(st.Repositories) > 0.

Signed-off-by: yxxhero <aiopsclub@163.com>
---
 .../environment_missing_in_subhelmfile/output.yaml |  5 -----
 .../output.yaml                                    |  5 -----
 .../output.yaml                                    |  5 -----
 .../testdata/snapshot/oci_need/output.yaml         |  5 -----
 .../testdata/snapshot/postrenderer/output.yaml     | 14 +++++---------
 .../helmfile/testdata/snapshot/pr_560/output.yaml  |  5 -----
 6 files changed, 5 insertions(+), 34 deletions(-)

diff --git a/test/e2e/template/helmfile/testdata/snapshot/environment_missing_in_subhelmfile/output.yaml b/test/e2e/template/helmfile/testdata/snapshot/environment_missing_in_subhelmfile/output.yaml
index d9b2cee7..24339b72 100644
--- a/test/e2e/template/helmfile/testdata/snapshot/environment_missing_in_subhelmfile/output.yaml
+++ b/test/e2e/template/helmfile/testdata/snapshot/environment_missing_in_subhelmfile/output.yaml
@@ -1,8 +1,3 @@
-Updating repo
-Hang tight while we grab the latest from your chart repositories...
-...Successfully got an update from the "myrepo" chart repository
-Update Complete. ⎈Happy Helming!⎈
-
 Building dependency release=test, chart=../../../charts/raw-0.0.1
 Templating release=test, chart=../../../charts/raw-0.0.1
 ---
diff --git a/test/e2e/template/helmfile/testdata/snapshot/environments_releases_without_same_yaml_part/output.yaml b/test/e2e/template/helmfile/testdata/snapshot/environments_releases_without_same_yaml_part/output.yaml
index fa261711..7f723eaa 100644
--- a/test/e2e/template/helmfile/testdata/snapshot/environments_releases_without_same_yaml_part/output.yaml
+++ b/test/e2e/template/helmfile/testdata/snapshot/environments_releases_without_same_yaml_part/output.yaml
@@ -1,8 +1,3 @@
-Updating repo
-Hang tight while we grab the latest from your chart repositories...
-...Successfully got an update from the "myrepo" chart repository
-Update Complete. ⎈Happy Helming!⎈
-
 Building dependency release=raw, chart=../../charts/raw-0.0.1
 Templating release=raw, chart=../../charts/raw-0.0.1
 ---
diff --git a/test/e2e/template/helmfile/testdata/snapshot/environments_values_gotmpl_with_environment_name/output.yaml b/test/e2e/template/helmfile/testdata/snapshot/environments_values_gotmpl_with_environment_name/output.yaml
index 22c1d96b..ca434208 100644
--- a/test/e2e/template/helmfile/testdata/snapshot/environments_values_gotmpl_with_environment_name/output.yaml
+++ b/test/e2e/template/helmfile/testdata/snapshot/environments_values_gotmpl_with_environment_name/output.yaml
@@ -1,8 +1,3 @@
-Updating repo
-Hang tight while we grab the latest from your chart repositories...
-...Successfully got an update from the "myrepo" chart repository
-Update Complete. ⎈Happy Helming!⎈
-
 Building dependency release=raw, chart=../../charts/raw-0.0.1
 Templating release=raw, chart=../../charts/raw-0.0.1
 ---
diff --git a/test/e2e/template/helmfile/testdata/snapshot/oci_need/output.yaml b/test/e2e/template/helmfile/testdata/snapshot/oci_need/output.yaml
index a779011b..3c5796df 100644
--- a/test/e2e/template/helmfile/testdata/snapshot/oci_need/output.yaml
+++ b/test/e2e/template/helmfile/testdata/snapshot/oci_need/output.yaml
@@ -1,8 +1,3 @@
-Updating repo
-Hang tight while we grab the latest from your chart repositories...
-...Successfully got an update from the "myrepo" chart repository
-Update Complete. ⎈Happy Helming!⎈
-
 Building dependency release=foo, chart=$WD/temp1/foo
 Saving 1 charts
 Downloading raw from repo oci://localhost:$REGISTRY_PORT/myrepo
diff --git a/test/e2e/template/helmfile/testdata/snapshot/postrenderer/output.yaml b/test/e2e/template/helmfile/testdata/snapshot/postrenderer/output.yaml
index f092898c..ccccaa5f 100644
--- a/test/e2e/template/helmfile/testdata/snapshot/postrenderer/output.yaml
+++ b/test/e2e/template/helmfile/testdata/snapshot/postrenderer/output.yaml
@@ -1,15 +1,10 @@
-Updating repo
-Hang tight while we grab the latest from your chart repositories...
-...Successfully got an update from the "myrepo" chart repository
-Update Complete. ⎈Happy Helming!⎈
-
-Building dependency release=foo, chart=$WD/testdata/charts/raw-0.1.0
-Building dependency release=baz, chart=$WD/temp1/baz
+Building dependency release=foo, chart=../../charts/raw-0.1.0
+Building dependency release=baz, chart=../../charts/raw-0.1.0
 Saving 1 charts
 Downloading raw from repo oci://localhost:$REGISTRY_PORT/myrepo
 Deleting outdated charts
 
-Templating release=foo, chart=$WD/testdata/charts/raw-0.1.0
+Templating release=foo, chart=../../charts/raw-0.1.0
 ---
 # Source: raw/templates/resources.yaml
 apiVersion: v1
@@ -20,7 +15,7 @@ metadata:
 data:
   foo: FOO
 
-Templating release=baz, chart=$WD/temp1/baz
+Templating release=baz, chart=../../charts/raw-0.1.0
 ---
 # Source: raw/templates/resources.yaml
 apiVersion: v1
@@ -30,6 +25,7 @@ metadata:
   namespace: default
 data:
   baz: BAZ
+
 ---
 apiVersion: v1
 kind: ConfigMap
diff --git a/test/e2e/template/helmfile/testdata/snapshot/pr_560/output.yaml b/test/e2e/template/helmfile/testdata/snapshot/pr_560/output.yaml
index 6b5d7a95..4c93a8b9 100644
--- a/test/e2e/template/helmfile/testdata/snapshot/pr_560/output.yaml
+++ b/test/e2e/template/helmfile/testdata/snapshot/pr_560/output.yaml
@@ -1,8 +1,3 @@
-Updating repo
-Hang tight while we grab the latest from your chart repositories...
-...Successfully got an update from the "myrepo" chart repository
-Update Complete. ⎈Happy Helming!⎈
-
 Building dependency release=foo, chart=../../charts/raw-0.1.0
 Templating release=foo, chart=../../charts/raw-0.1.0
 ---

From a5b2381581f7637cad4aa630d04995f747536781 Mon Sep 17 00:00:00 2001
From: yxxhero <aiopsclub@163.com>
Date: Fri, 23 Jan 2026 20:58:24 +0800
Subject: [PATCH 05/12] fix: correct snapshot test expectations for repo update
 optimization

- Re-add trailing newlines to environment_missing_in_subhelmfile output
- Restore correct chart paths (/... instead of ../../...)
- Restore postrenderer output with cm2 ConfigMap and correct field order
- Fixes CI test failures introduced by incorrect snapshot updates

Signed-off-by: yxxhero <aiopsclub@163.com>
---
 .../output.yaml                               |  3 ++-
 .../snapshot/postrenderer/output.yaml         | 21 ++++++++++++-------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/test/e2e/template/helmfile/testdata/snapshot/environment_missing_in_subhelmfile/output.yaml b/test/e2e/template/helmfile/testdata/snapshot/environment_missing_in_subhelmfile/output.yaml
index 24339b72..c0cb7536 100644
--- a/test/e2e/template/helmfile/testdata/snapshot/environment_missing_in_subhelmfile/output.yaml
+++ b/test/e2e/template/helmfile/testdata/snapshot/environment_missing_in_subhelmfile/output.yaml
@@ -9,4 +9,5 @@ Building dependency release=no-envs, chart=../../../charts/raw-0.0.1
 Templating release=no-envs, chart=../../../charts/raw-0.0.1
 ---
 # Source: raw/templates/resources.yaml
-envName: test
\ No newline at end of file
+envName: test
+
diff --git a/test/e2e/template/helmfile/testdata/snapshot/postrenderer/output.yaml b/test/e2e/template/helmfile/testdata/snapshot/postrenderer/output.yaml
index ccccaa5f..d661ef51 100644
--- a/test/e2e/template/helmfile/testdata/snapshot/postrenderer/output.yaml
+++ b/test/e2e/template/helmfile/testdata/snapshot/postrenderer/output.yaml
@@ -1,10 +1,10 @@
-Building dependency release=foo, chart=../../charts/raw-0.1.0
-Building dependency release=baz, chart=../../charts/raw-0.1.0
+Building dependency release=foo, chart=$WD/testdata/charts/raw-0.1.0
+Building dependency release=baz, chart=$WD/temp1/baz
 Saving 1 charts
 Downloading raw from repo oci://localhost:$REGISTRY_PORT/myrepo
 Deleting outdated charts
 
-Templating release=foo, chart=../../charts/raw-0.1.0
+Templating release=foo, chart=$WD/testdata/charts/raw-0.1.0
 ---
 # Source: raw/templates/resources.yaml
 apiVersion: v1
@@ -14,8 +14,15 @@ metadata:
   namespace: default
 data:
   foo: FOO
+---
+apiVersion: v1
+kind: ConfigMap
+data:
+  two: TWO
+metadata:
+  name: cm2
 
-Templating release=baz, chart=../../charts/raw-0.1.0
+Templating release=baz, chart=$WD/temp1/baz
 ---
 # Source: raw/templates/resources.yaml
 apiVersion: v1
@@ -25,11 +32,11 @@ metadata:
   namespace: default
 data:
   baz: BAZ
-
 ---
 apiVersion: v1
 kind: ConfigMap
+data:
+  one: ONE
 metadata:
   name: cm1
-data:
-  one: ONE
\ No newline at end of file
+

From 5b031b5df24f831a03ef3cf5e7d06b048de010ca Mon Sep 17 00:00:00 2001
From: yxxhero <aiopsclub@163.com>
Date: Fri, 23 Jan 2026 21:30:34 +0800
Subject: [PATCH 06/12] fix: update integration test expected lint output for
 repo update

Include 'Updating repo' messages in expected lint output files
to match the new behavior where helm repo update is run once
before building dependencies.

Signed-off-by: yxxhero <aiopsclub@163.com>
---
 .../test-cases/chart-needs/output/lint-live           | 11 +++++++++++
 .../test-cases/chart-needs/output/lint-live-helm4     | 11 +++++++++++
 2 files changed, 22 insertions(+)

diff --git a/test/integration/test-cases/chart-needs/output/lint-live b/test/integration/test-cases/chart-needs/output/lint-live
index e0fa652c..0ed0afe2 100644
--- a/test/integration/test-cases/chart-needs/output/lint-live
+++ b/test/integration/test-cases/chart-needs/output/lint-live
@@ -1,4 +1,14 @@
 "azuredisk-csi-driver" has been added to your repositories
+
+Hang tight while we grab the latest from your chart repositories...
+...Successfully got an update from "azuredisk-csi-driver" chart repository
+...Successfully got an update from "ingress-nginx" chart repository
+...Successfully got an update from "elastic" chart repository
+...Successfully got an update from "incubator" chart repository
+...Successfully got an update from "prometheus-community" chart repository
+...Successfully got an update from "bitnami" chart repository
+Update Complete. ⎈Happy Helming!⎈
+
 [INFO] Chart.yaml: icon is recommended
 [INFO] values.yaml: file does not exist
 
@@ -6,3 +16,4 @@
 [INFO] Chart.yaml: icon is recommended
 
 1 chart(s) linted, 0 chart(s) failed
+
diff --git a/test/integration/test-cases/chart-needs/output/lint-live-helm4 b/test/integration/test-cases/chart-needs/output/lint-live-helm4
index e0fa652c..31f02dda 100644
--- a/test/integration/test-cases/chart-needs/output/lint-live-helm4
+++ b/test/integration/test-cases/chart-needs/output/lint-live-helm4
@@ -1,4 +1,14 @@
 "azuredisk-csi-driver" has been added to your repositories
+
+Hang tight while we grab the latest from your chart repositories...
+...Successfully got an update from the "azuredisk-csi-driver" chart repository
+...Successfully got an update from the "ingress-nginx" chart repository
+...Successfully got an update from the "elastic" chart repository
+...Successfully got an update from the "incubator" chart repository
+...Successfully got an update from the "prometheus-community" chart repository
+...Successfully got an update from the "bitnami" chart repository
+Update Complete.⎈Happy Helming!⎈
+
 [INFO] Chart.yaml: icon is recommended
 [INFO] values.yaml: file does not exist
 
@@ -6,3 +16,4 @@
 [INFO] Chart.yaml: icon is recommended
 
 1 chart(s) linted, 0 chart(s) failed
+

From 436a790aef129ae8f8c9a13b9e966caca7ac1016 Mon Sep 17 00:00:00 2001
From: yxxhero <aiopsclub@163.com>
Date: Fri, 23 Jan 2026 22:03:08 +0800
Subject: [PATCH 07/12] fix: remove extra blank line from lint output files

Integration test output files had an extra blank line that was
not present in the expected output, causing test failures.

Signed-off-by: yxxhero <aiopsclub@163.com>
---
 .../test-cases/chart-needs/output/lint-live       |  1 -
 .../test-cases/chart-needs/output/lint-live-helm4 | 15 +++++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/test/integration/test-cases/chart-needs/output/lint-live b/test/integration/test-cases/chart-needs/output/lint-live
index 0ed0afe2..cbb93a77 100644
--- a/test/integration/test-cases/chart-needs/output/lint-live
+++ b/test/integration/test-cases/chart-needs/output/lint-live
@@ -1,5 +1,4 @@
 "azuredisk-csi-driver" has been added to your repositories
-
 Hang tight while we grab the latest from your chart repositories...
 ...Successfully got an update from "azuredisk-csi-driver" chart repository
 ...Successfully got an update from "ingress-nginx" chart repository
diff --git a/test/integration/test-cases/chart-needs/output/lint-live-helm4 b/test/integration/test-cases/chart-needs/output/lint-live-helm4
index 31f02dda..cbb93a77 100644
--- a/test/integration/test-cases/chart-needs/output/lint-live-helm4
+++ b/test/integration/test-cases/chart-needs/output/lint-live-helm4
@@ -1,13 +1,12 @@
 "azuredisk-csi-driver" has been added to your repositories
-
 Hang tight while we grab the latest from your chart repositories...
-...Successfully got an update from the "azuredisk-csi-driver" chart repository
-...Successfully got an update from the "ingress-nginx" chart repository
-...Successfully got an update from the "elastic" chart repository
-...Successfully got an update from the "incubator" chart repository
-...Successfully got an update from the "prometheus-community" chart repository
-...Successfully got an update from the "bitnami" chart repository
-Update Complete.⎈Happy Helming!⎈
+...Successfully got an update from "azuredisk-csi-driver" chart repository
+...Successfully got an update from "ingress-nginx" chart repository
+...Successfully got an update from "elastic" chart repository
+...Successfully got an update from "incubator" chart repository
+...Successfully got an update from "prometheus-community" chart repository
+...Successfully got an update from "bitnami" chart repository
+Update Complete. ⎈Happy Helming!⎈
 
 [INFO] Chart.yaml: icon is recommended
 [INFO] values.yaml: file does not exist

From fb9ee4479da9e9cb666ae5b13339abd04151e894 Mon Sep 17 00:00:00 2001
From: yxxhero <aiopsclub@163.com>
Date: Fri, 23 Jan 2026 22:33:47 +0800
Subject: [PATCH 08/12] fix: update lint output for single repo update

With the repo update optimization, lint runs only once
with 'Updating repo' messages instead of running twice.
Update expected output to match new single-run behavior.

Signed-off-by: yxxhero <aiopsclub@163.com>
---
 test/integration/test-cases/chart-needs/output/lint-live       | 3 ---
 test/integration/test-cases/chart-needs/output/lint-live-helm4 | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/test/integration/test-cases/chart-needs/output/lint-live b/test/integration/test-cases/chart-needs/output/lint-live
index cbb93a77..f60513c7 100644
--- a/test/integration/test-cases/chart-needs/output/lint-live
+++ b/test/integration/test-cases/chart-needs/output/lint-live
@@ -12,7 +12,4 @@ Update Complete. ⎈Happy Helming!⎈
 [INFO] values.yaml: file does not exist
 
 1 chart(s) linted, 0 chart(s) failed
-[INFO] Chart.yaml: icon is recommended
-
-1 chart(s) linted, 0 chart(s) failed
 
diff --git a/test/integration/test-cases/chart-needs/output/lint-live-helm4 b/test/integration/test-cases/chart-needs/output/lint-live-helm4
index cbb93a77..f60513c7 100644
--- a/test/integration/test-cases/chart-needs/output/lint-live-helm4
+++ b/test/integration/test-cases/chart-needs/output/lint-live-helm4
@@ -12,7 +12,4 @@ Update Complete. ⎈Happy Helming!⎈
 [INFO] values.yaml: file does not exist
 
 1 chart(s) linted, 0 chart(s) failed
-[INFO] Chart.yaml: icon is recommended
-
-1 chart(s) linted, 0 chart(s) failed
 

From db2f0fee9b4b59c63c6c321472e19c211ef63eb8 Mon Sep 17 00:00:00 2001
From: yxxhero <aiopsclub@163.com>
Date: Sat, 24 Jan 2026 08:36:51 +0800
Subject: [PATCH 09/12] fix: filter out repo update messages in lint test

Update test runner to filter out repo update messages that are
now generated by the single helm.UpdateRepo() call, keeping
the expected lint output consistent with the original behavior.

Signed-off-by: yxxhero <aiopsclub@163.com>
---
 test/integration/test-cases/chart-needs.sh            |  2 +-
 .../test-cases/chart-needs/output/lint-live           | 11 ++---------
 .../test-cases/chart-needs/output/lint-live-helm4     | 11 ++---------
 3 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/test/integration/test-cases/chart-needs.sh b/test/integration/test-cases/chart-needs.sh
index bbf91605..c02228ef 100644
--- a/test/integration/test-cases/chart-needs.sh
+++ b/test/integration/test-cases/chart-needs.sh
@@ -35,7 +35,7 @@ for i in $(seq 10); do
     info "Comparing lint/chart-needs #$i"
     # Remove azuredisk-csi-driver repo to ensure consistent output (repo addition message)
     ${helm} repo remove azuredisk-csi-driver &>/dev/null || true
-    ${helmfile} -f ${chart_need_case_input_dir}/${config_file} lint --include-needs | grep -v Linting | grep -v "has been removed" | grep -Ev "(Warning:.*is not a valid SemVerV2|\[WARNING\].*is not a valid SemVerV2|failed to load plugins)" > ${chart_needs_lint_reverse} || fail "\"helmfile lint\" shouldn't fail"
+    ${helmfile} -f ${chart_need_case_input_dir}/${config_file} lint --include-needs | grep -v Linting | grep -v "has been removed" | grep -Ev "(Updating repo|Hang tight while we grab|Update Complete|Successfully got an update from|Warning:.*is not a valid SemVerV2|\[WARNING\].*is not a valid SemVerV2|failed to load plugins)" > ${chart_needs_lint_reverse} || fail "\"helmfile lint\" shouldn't fail"
     diff -u ${lint_out_file} ${chart_needs_lint_reverse} || fail "\"helmfile lint\" should be consistent"
 done
 
diff --git a/test/integration/test-cases/chart-needs/output/lint-live b/test/integration/test-cases/chart-needs/output/lint-live
index f60513c7..e0fa652c 100644
--- a/test/integration/test-cases/chart-needs/output/lint-live
+++ b/test/integration/test-cases/chart-needs/output/lint-live
@@ -1,15 +1,8 @@
 "azuredisk-csi-driver" has been added to your repositories
-Hang tight while we grab the latest from your chart repositories...
-...Successfully got an update from "azuredisk-csi-driver" chart repository
-...Successfully got an update from "ingress-nginx" chart repository
-...Successfully got an update from "elastic" chart repository
-...Successfully got an update from "incubator" chart repository
-...Successfully got an update from "prometheus-community" chart repository
-...Successfully got an update from "bitnami" chart repository
-Update Complete. ⎈Happy Helming!⎈
-
 [INFO] Chart.yaml: icon is recommended
 [INFO] values.yaml: file does not exist
 
 1 chart(s) linted, 0 chart(s) failed
+[INFO] Chart.yaml: icon is recommended
 
+1 chart(s) linted, 0 chart(s) failed
diff --git a/test/integration/test-cases/chart-needs/output/lint-live-helm4 b/test/integration/test-cases/chart-needs/output/lint-live-helm4
index f60513c7..e0fa652c 100644
--- a/test/integration/test-cases/chart-needs/output/lint-live-helm4
+++ b/test/integration/test-cases/chart-needs/output/lint-live-helm4
@@ -1,15 +1,8 @@
 "azuredisk-csi-driver" has been added to your repositories
-Hang tight while we grab the latest from your chart repositories...
-...Successfully got an update from "azuredisk-csi-driver" chart repository
-...Successfully got an update from "ingress-nginx" chart repository
-...Successfully got an update from "elastic" chart repository
-...Successfully got an update from "incubator" chart repository
-...Successfully got an update from "prometheus-community" chart repository
-...Successfully got an update from "bitnami" chart repository
-Update Complete. ⎈Happy Helming!⎈
-
 [INFO] Chart.yaml: icon is recommended
 [INFO] values.yaml: file does not exist
 
 1 chart(s) linted, 0 chart(s) failed
+[INFO] Chart.yaml: icon is recommended
 
+1 chart(s) linted, 0 chart(s) failed

From 45ce5cf1e3b5fccf416bb2027e1a8e63d0eedd3e Mon Sep 17 00:00:00 2001
From: yxxhero <aiopsclub@163.com>
Date: Sat, 24 Jan 2026 11:11:26 +0800
Subject: [PATCH 10/12] fix: filter repo update messages from diff test

Filter out repo update messages in diff test output to
match new behavior where helm.UpdateRepo() is called once.

Signed-off-by: yxxhero <aiopsclub@163.com>
---
 test/integration/test-cases/chart-needs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration/test-cases/chart-needs.sh b/test/integration/test-cases/chart-needs.sh
index c02228ef..ededa85a 100644
--- a/test/integration/test-cases/chart-needs.sh
+++ b/test/integration/test-cases/chart-needs.sh
@@ -43,7 +43,7 @@ for i in $(seq 10); do
     info "Comparing diff/chart-needs #$i"
     # Remove azuredisk-csi-driver repo to ensure consistent output (repo addition message)
     ${helm} repo remove azuredisk-csi-driver &>/dev/null || true
-    ${helmfile} -f ${chart_need_case_input_dir}/${config_file} diff --include-needs | grep -Ev "Comparing release=azuredisk-csi-storageclass, chart=.*/chartify.*/azuredisk-csi-storageclass" > ${chart_needs_diff_reverse}.tmp || fail "\"helmfile diff\" shouldn't fail"
+    ${helmfile} -f ${chart_need_case_input_dir}/${config_file} diff --include-needs | grep -Ev "(Updating repo|Hang tight while we grab|Update Complete|Successfully got an update from|Comparing release=azuredisk-csi-storageclass, chart=.*/chartify.*/azuredisk-csi-storageclass" > ${chart_needs_diff_reverse}.tmp || fail "\"helmfile diff\" shouldn't fail"
     cat ${chart_needs_diff_reverse}.tmp | sed -E '/\*{20}/,/\*{20}/d' > ${chart_needs_diff_reverse}
 
     # With --enable-live-output, there's a race condition that can cause non-deterministic ordering

From 7712350d2aa4549abdf85e3202078adc8954bd58 Mon Sep 17 00:00:00 2001
From: yxxhero <aiopsclub@163.com>
Date: Sat, 24 Jan 2026 13:38:20 +0800
Subject: [PATCH 11/12] Fix missing closing parenthesis in grep command

Signed-off-by: yxxhero <aiopsclub@163.com>
---
 test/integration/test-cases/chart-needs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration/test-cases/chart-needs.sh b/test/integration/test-cases/chart-needs.sh
index ededa85a..a50ceab1 100644
--- a/test/integration/test-cases/chart-needs.sh
+++ b/test/integration/test-cases/chart-needs.sh
@@ -43,7 +43,7 @@ for i in $(seq 10); do
     info "Comparing diff/chart-needs #$i"
     # Remove azuredisk-csi-driver repo to ensure consistent output (repo addition message)
     ${helm} repo remove azuredisk-csi-driver &>/dev/null || true
-    ${helmfile} -f ${chart_need_case_input_dir}/${config_file} diff --include-needs | grep -Ev "(Updating repo|Hang tight while we grab|Update Complete|Successfully got an update from|Comparing release=azuredisk-csi-storageclass, chart=.*/chartify.*/azuredisk-csi-storageclass" > ${chart_needs_diff_reverse}.tmp || fail "\"helmfile diff\" shouldn't fail"
+    ${helmfile} -f ${chart_need_case_input_dir}/${config_file} diff --include-needs | grep -Ev "(Updating repo|Hang tight while we grab|Update Complete|Successfully got an update from|Comparing release=azuredisk-csi-storageclass, chart=.*/chartify.*/azuredisk-csi-storageclass)" > ${chart_needs_diff_reverse}.tmp || fail "\"helmfile diff\" shouldn't fail"
     cat ${chart_needs_diff_reverse}.tmp | sed -E '/\*{20}/,/\*{20}/d' > ${chart_needs_diff_reverse}
 
     # With --enable-live-output, there's a race condition that can cause non-deterministic ordering

From 2ce62f22ac566c2505f86687b23a474c4ffcc22e Mon Sep 17 00:00:00 2001
From: yxxhero <aiopsclub@163.com>
Date: Sat, 24 Jan 2026 14:48:21 +0800
Subject: [PATCH 12/12] fix: prevent --args flags from being passed to helm
 repo commands

When helmfile template --args is used, the extra flags were being
passed to helm repo update and helm repo add commands, which don't
support all flags that helm template/install support. This caused
failures when flags like --dry-run were passed via --args.

The fix saves the extra flags before executing helm repo commands,
clears them, and restores them afterwards to ensure repo commands
run without unsupported flags.

Fixes CI issue in PR #2378 where test issue-1749 fails
with "Error: unknown flag: --dry-run" during helm repo update.

Signed-off-by: yxxhero <aiopsclub@163.com>
---
 pkg/helmexec/exec.go | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkg/helmexec/exec.go b/pkg/helmexec/exec.go
index 34a6e5dc..08f1d5d3 100644
--- a/pkg/helmexec/exec.go
+++ b/pkg/helmexec/exec.go
@@ -204,6 +204,12 @@ func (helm *execer) AddRepo(name, repository, cafile, certfile, keyfile, usernam
 		return fmt.Errorf("empty field name")
 	}
 
+	savedExtra := helm.extra
+	helm.extra = []string{}
+	defer func() {
+		helm.extra = savedExtra
+	}()
+
 	switch managed {
 	case "acr":
 		helm.logger.Infof("Adding repo %v (acr)", name)
@@ -252,6 +258,11 @@ func (helm *execer) AddRepo(name, repository, cafile, certfile, keyfile, usernam
 
 func (helm *execer) UpdateRepo() error {
 	helm.logger.Info("Updating repo")
+	savedExtra := helm.extra
+	helm.extra = []string{}
+	defer func() {
+		helm.extra = savedExtra
+	}()
 	out, err := helm.exec([]string{"repo", "update"}, map[string]string{}, nil)
 	helm.info(out)
 	return err