feat: add support for helm v4 --server-side flag#1021
Merged
Conversation
Add the --server-side flag to , matching helm v4's upgrade command. The flag accepts "true", "false", or "auto" (default "auto") and is forwarded to helm when running Helm v4: - (HELM_DIFF_USE_UPGRADE_DRY_RUN=true): all values including "auto" are forwarded. - : only "true"/"false" are forwarded, since template registers --server-side as a bool (default true) that does not accept "auto". The flag is Helm v4 only — it is accepted but not forwarded when running Helm v3 (the flag does not exist there). Note: --server-side has no effect on manifest rendering in dry-run mode. It is forwarded for semantic correctness and wrapper compatibility so that helm-diff can be used with the same flags as . Closes #1020 Signed-off-by: yxxhero <aiopsclub@163.com>
The engineerd/setup-kind@v0.6.2 tag points to a commit that lacks the compiled dist/main/index.js entry point, causing all integration test jobs to fail with: File not found: '.../setup-kind/v0.6.2/dist/main/index.js' Switch to helm/kind-action@v1.14.0, the official Helm project kind action, which properly commits its build artifacts. Signed-off-by: yxxhero <aiopsclub@163.com>
databus23
reviewed
Jun 16, 2026
databus23
left a comment
databus23
left a comment
Owner
There was a problem hiding this comment.
Nice PR overall, the feature is correct and well-documented. One minor suggestion on test structure:
TestGetServerSideFlags tests a standalone getServerSideFlags() helper defined in the test file that mirrors the production logic in (*diffCmd).template(). If the two ever diverge, the test still passes. It's testing a reimplementation, not the real code.
A cleaner approach: extract the inline switch block in template() into a package-level function (e.g. serverSideFlags(isHelmV4 bool, useUpgradeDryRun bool, serverSide string) []string), then call it from both template() and the test. That way the test exercises the actual production path.
Per review feedback, extract the inline switch block from template() into a package-level serverSideFlags(isHelmV4, useUpgradeDryRun, serverSide) function. The test now calls the production function directly instead of a test-only mirror. Signed-off-by: yxxhero <aiopsclub@163.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Add support for the Helm v4
--server-sideupgrade flag, as requested in #1020.The flag accepts
"true","false", or"auto"(default"auto"), matchinghelm v4 upgradeexactly.Changes
cmd/upgrade.go: Added--server-sideflag (StringVar, default"auto") with input validation inRunE.cmd/helm.go: Forward the flag to helm when running Helm v4:helm upgrade --dry-run(HELM_DIFF_USE_UPGRADE_DRY_RUN=true): forward all values including"auto".helm template: forward only"true"/"false"— template registers--server-sideas abool(defaulttrue) that rejects"auto".README.md: Documented the flag in alphabetical order in both command sections.TestServerSideFlagValidationandTestGetServerSideFlags.Notes
helm templateandhelm upgrade --dry-runbail out before the apply step whereServerSideApplyis consulted. It is forwarded for semantic correctness and wrapper compatibility.isHelmVersionGreaterThanEqualcall (no redundant subprocess invocations).Closes #1020