Skip to content

[release-2.1] chore(deps): update dependency helm to v4 - #573

Merged
openshift-merge-bot[bot] merged 1 commit into
redhat-developer:release-2.1from
rm3l:cherrypick/release-2.1/renovate--main-helm-4.x
Sep 30, 2026
Merged

openshift-merge-bot[bot] merged 1 commit into
redhat-developer:release-2.1from
rm3l:cherrypick/release-2.1/renovate--main-helm-4.x

Conversation

@rm3l

@rm3l rm3l commented Sep 30, 2026

Copy link
Copy Markdown
Member

manual cherrypick of #540

* chore(deps): update dependency helm to v4

* fix(must-gather): remove duplicate env vars in CI values for Helm v4 compat

Helm v4 uses server-side apply (SSA) by default. SSA treats env as a
list-map keyed by name and rejects duplicate keys at the apply layer,
even though Kubernetes itself allows duplicate env vars (last one wins).

The extraEnvVars in with-secrets-and-cluster-info-values.yaml duplicated
CMD_TIMEOUT and LOG_LEVEL already set by the template, causing
INSTALLATION FAILED under SSA.

Replace them with a non-conflicting CUSTOM_EXTRA_VAR to preserve the
extraEnvVars injection test without collisions.

* chore(must-gather): bump chart version to 0.8.2

* run pre-commit hooks

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Armel Soro <asoro@redhat.com>
@rm3l
rm3l requested a review from a team as a code owner September 30, 2026 14:19
@rm3l rm3l added the lgtm label Sep 30, 2026
@sonarqubecloud

Copy link
Copy Markdown

@rhdh-qodo-merge

Copy link
Copy Markdown

PR Summary by Qodo

Upgrade CI to Helm 4 and fix must-gather install values

⚙️ Configuration changes 🐞 Bug fix 🕐 20-40 Minutes

Grey Divider

AI Description

• Upgrade chart-related CI workflows from Helm 3.22.0 to 4.3.0.
• Replace duplicate must-gather test environment variables that cause Helm 4 installs to fail.
• Bump the must-gather chart to 0.7.2 and update its README.
Diagram

graph TD
  CI["Chart CI"] --> Helm["Helm 4"] --> CT["Chart testing"] --> Render["Rendered deployment"] --> K8s["Kubernetes apply"]
  Values["Must-gather values"] --> Render
Loading
High-Level Assessment

Updating the shared CI action and each workflow that installs Helm keeps the upgrade consistent. Replacing the conflicting test inputs preserves extraEnvVars coverage without changing chart behavior; adding template-level deduplication would broaden the scope unnecessarily.

Files changed (8) +10 / -12

Bug fix (1) +2 / -4
with-secrets-and-cluster-info-values.yamlRemove duplicate environment variables from test values +2/-4

Remove duplicate environment variables from test values

• Replaces CMD_TIMEOUT and LOG_LEVEL, which the deployment template already sets, with CUSTOM_EXTRA_VAR. This retains extraEnvVars test coverage without the duplicate names that fail during Helm 4 installs.

charts/must-gather/ci/with-secrets-and-cluster-info-values.yaml

Documentation (1) +2 / -2
README.mdDocument must-gather chart version 0.7.2 +2/-2

Document must-gather chart version 0.7.2

• Updates the version badge and installation example to match Chart.yaml.

charts/must-gather/README.md

Other (6) +6 / -6
action.ymlUse Helm 4 for chart tests +1/-1

Use Helm 4 for chart tests

• Changes the reusable chart-testing action from Helm 3.22.0 to 4.3.0.

.github/actions/test-charts/action.yml

lint.yamlUse Helm 4 for chart linting +1/-1

Use Helm 4 for chart linting

• Updates the lint workflow’s Helm version to 4.3.0.

.github/workflows/lint.yaml

pre-commit.yamlUse Helm 4 in pre-commit CI +1/-1

Use Helm 4 in pre-commit CI

• Updates the Helm installation used by the pre-commit workflow to 4.3.0.

.github/workflows/pre-commit.yaml

snyk.yamlRender charts with Helm 4 for Snyk +1/-1

Render charts with Helm 4 for Snyk

• Updates the Snyk workflow’s Helm version to 4.3.0 for chart rendering.

.github/workflows/snyk.yaml

sync-lightspeed-configs.yamlUse Helm 4 for Lightspeed config sync +1/-1

Use Helm 4 for Lightspeed config sync

• Updates the config-sync workflow’s Helm installation to 4.3.0.

.github/workflows/sync-lightspeed-configs.yaml

Chart.yamlBump must-gather chart version +1/-1

Bump must-gather chart version

• Increments the chart version from 0.7.1 to 0.7.2.

charts/must-gather/Chart.yaml

@rhdh-qodo-merge

Copy link
Copy Markdown

Code Review by Qodo

🐞 Bugs (0) 📘 Rule violations (0) 📎 Requirement gaps (0)

Grey Divider

Great, no issues found!

Qodo reviewed your code and found no material issues that require review

Grey Divider

Tip of the day
💡 Did you know, you can route each severity your way: inline, summary, both, or drop

More tips ↗ | Customize Qodo ↗ | Qodo docs ↗

Grey Divider

Qodo Logo

@rhdh-qodo-merge

Copy link
Copy Markdown

Important

The /generate_labels command by Qodo is sunsetting on the 1st of October 2026 and will no longer be available. We recommend switching to the latest Qodo review capabilities. Learn more

@openshift-merge-bot
openshift-merge-bot Bot merged commit 7470908 into redhat-developer:release-2.1 Sep 30, 2026
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant