Skip to content

Match the build-time helm binary to the linked helm library (release-v1.42) - #5214

Merged
dimitri-nicolo merged 1 commit into
tigera:release-v1.42from
dimitri-nicolo:dimitri-helm-binary-3.21.3-v1.42
Aug 18, 2026
Merged

Match the build-time helm binary to the linked helm library (release-v1.42)#5214
dimitri-nicolo merged 1 commit into
tigera:release-v1.42from
dimitri-nicolo:dimitri-helm-binary-3.21.3-v1.42

Conversation

@dimitri-nicolo

Copy link
Copy Markdown
Contributor

HELM3_VERSION v3.11.3 → v3.21.3

This is the helm program hack/bin downloads to render the Envoy Gateway chart into pkg/render/gatewayapi/gateway_api_resources.yaml at build time. It's a build tool — it never ships in the operator image — and it's separate from the helm.sh/helm/v3 library the operator links, which is already on v3.21.3. The binary had been left on a 2021 release, ten minors behind.

The regenerated resources file is committed alongside, because the make rule keys off the versioned binary name and would otherwise re-render it and fail dirty-check.

The upgrade is inert

Across 58,298 lines the only change is nine comment lines, where helm now records the full chart path in the source comment:

-# Source: crds/gatewayapi-crds.yaml
+# Source: gateway-helm/charts/crds/crds/gatewayapi-crds.yaml

No Kubernetes resource changes — not a field, not an ordering, not a generated label. Those nine lines are YAML comments, dropped at parse time.

Verified

  • v3.11.3 re-renders the committed file byte for byte, so the comparison is against a faithful baseline rather than a file that had drifted from its generator.
  • git diff on the regenerated file touches only # Source: lines.
  • go test ./pkg/render/gatewayapi/... passes.

Context

Noticed while answering a review comment on #5176. master gets the same bump separately (#5213) rather than by cherry-pick — it pulls the chart tarball instead of templating it, so its commit carries no resources file. release-v1.40 takes this commit as a clean cherry-pick; see its companion PR.

Release note:

None

HELM3_VERSION = v3.11.3 -> v3.21.3

This is the helm program hack/bin downloads to render the Envoy Gateway chart
into pkg/render/gatewayapi/gateway_api_resources.yaml at build time. It is a
build tool and never ships in the operator image, separate from the
helm.sh/helm/v3 library the operator links -- which is already on v3.21.3
while the binary sat ten minors behind on a 2021 release.

The regenerated resources file is committed alongside, because the make rule
keys off the versioned binary name and would otherwise re-render it and fail
dirty-check.

The upgrade is inert in the way that matters. Across 58,298 lines the only
change is nine comment lines, where helm now records the full chart path in
the source comment:

  -# Source: crds/gatewayapi-crds.yaml
  +# Source: gateway-helm/charts/crds/crds/gatewayapi-crds.yaml

No Kubernetes resource changes -- not a field, not an ordering, not a
generated label. The nine lines are YAML comments, dropped at parse time.

Verified:
  - v3.11.3 re-renders the committed file byte for byte, so the comparison is
    against a faithful baseline rather than a drifted one
  - `git diff` on the regenerated file touches only `# Source:` lines
  - go test ./pkg/render/gatewayapi/... passes

master gets the same bump separately rather than by cherry-pick: it pulls the
chart tarball instead of templating it, so its commit carries no resources
file and its Makefile line reads v3.21.1. release-v1.40 takes this commit as
a clean cherry-pick.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR updates the build-time Helm CLI version used by the Makefile to match the already-upgraded linked helm.sh/helm/v3 Go library version, and regenerates the committed Envoy Gateway rendered resources so builds remain reproducible/clean.

Changes:

  • Bump HELM3_VERSION from v3.11.3 to v3.21.3 for the build-time Helm binary download.
  • Regenerate pkg/render/gatewayapi/gateway_api_resources.yaml, with changes limited to # Source: comment lines (no resource content changes).

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File Description
Makefile Updates the build-time Helm binary version used to render Envoy Gateway resources.
pkg/render/gatewayapi/gateway_api_resources.yaml Re-rendered output committed to keep builds clean; only # Source: comment paths change.

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

@dimitri-nicolo
dimitri-nicolo merged commit 0c75be4 into tigera:release-v1.42 Aug 18, 2026
8 checks passed
@dimitri-nicolo
dimitri-nicolo deleted the dimitri-helm-binary-3.21.3-v1.42 branch August 18, 2026 19:08
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.

4 participants