Skip to content

feat: bump envoy third-party components for EG v1.7.0#12168

Merged
electricjesus merged 3 commits intoprojectcalico:masterfrom
pasanw:pasan/bump-envoy-gateway-1.7.0
Mar 27, 2026
Merged

feat: bump envoy third-party components for EG v1.7.0#12168
electricjesus merged 3 commits intoprojectcalico:masterfrom
pasanw:pasan/bump-envoy-gateway-1.7.0

Conversation

@pasanw
Copy link
Copy Markdown
Member

@pasanw pasanw commented Mar 17, 2026

Summary

  • envoy-gateway: v1.5.9 → v1.7.0
  • envoy-proxy: v1.35.8 → v1.37.1 (per compatibility matrix)
  • envoy-ratelimit: c8765e893fb70258
  • Drops all 3 CVE patches — v1.7.0 ships with equal or newer deps:
    • containerd v1.7.30 (patch bumped to v1.7.29)
    • docker/cli v29.2.0 (equal)
    • otel/sdk v1.39.0 (verified clean via govulncheck)
  • Adds xmeshes.gateway.networking.x-k8s.io to operator RBAC (new experimental CRD in Gateway API v1.4.1)

Context

Envoy Gateway v1.5 reached EOL on 2026/02/13. Per the compatibility matrix, v1.7.0 requires:

  • Envoy Proxy: v1.37.1
  • Gateway API: v1.4.1
  • Kubernetes: v1.32–v1.35

Blockers before merging

Test plan

  • envoy-gateway builds from source at v1.7.0 (make -C third_party/envoy-gateway image)
  • envoy-ratelimit builds from source at 3fb70258 (make -C third_party/envoy-ratelimit image)
  • CVE assessment: all 3 removed patches confirmed obsolete against v1.7.0 go.mod
  • envoy-proxy image builds with correct binary
  • E2E gateway tests pass on a test cluster

Release note:

Bump Envoy Gateway from v1.5.9 to v1.7.0 and Envoy Proxy from v1.35.8 to v1.37.1.

- envoy-gateway: v1.5.9 → v1.7.0
- envoy-proxy: v1.35.8 → v1.37.0 (envoybinary tag TBD, pending tigera/envoybinary build)
- envoy-ratelimit: c8765e89 → 3fb70258
- Drops all 3 CVE patches — v1.7.0 ships with equal or newer deps
  (containerd v1.7.30, docker/cli v29.2.0, otel/sdk v1.39.0 verified clean via govulncheck)
- Adds xmeshes.gateway.networking.x-k8s.io to operator RBAC (new experimental CRD in Gateway API v1.4.1)

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@marvin-tigera marvin-tigera added this to the Calico v3.32.0 milestone Mar 17, 2026
@marvin-tigera marvin-tigera added release-note-required Change has user-facing impact (no matter how small) docs-pr-required Change is not yet documented labels Mar 17, 2026
@pasanw pasanw marked this pull request as ready for review March 18, 2026 16:13
@pasanw pasanw requested review from a team as code owners March 18, 2026 16:13
Copilot AI review requested due to automatic review settings March 18, 2026 16:13
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

Updates Calico’s bundled Envoy Gateway stack to align with Envoy Gateway v1.7.0 requirements (including newer Envoy Proxy), removes now-obsolete CVE patch carry, and expands operator RBAC for a newly introduced experimental Gateway API CRD.

Changes:

  • Bump third_party versions: Envoy Gateway to v1.7.0 and Envoy Ratelimit commit to 3fb70258.
  • Remove three Envoy Gateway dependency bump patches that are no longer needed with v1.7.0.
  • Add xmeshes.gateway.networking.x-k8s.io to operator RBAC across manifests and Helm chart template.

Reviewed changes

Copilot reviewed 10 out of 10 changed files in this pull request and generated 1 comment.

Show a summary per file
File Description
third_party/envoy-ratelimit/Makefile Updates the pinned envoy-ratelimit commit SHA used for source builds.
third_party/envoy-proxy/Makefile Updates the envoybinary image reference for Envoy Proxy builds (currently left as a placeholder).
third_party/envoy-gateway/Makefile Bumps the Envoy Gateway version to v1.7.0 for source/image builds.
third_party/envoy-gateway/patches/0001-Bump-containerd-to-v1.7.29.patch Removes an obsolete CVE-related dependency bump patch.
third_party/envoy-gateway/patches/0002-Bump-otel-sdk-to-v1.40.0.patch Removes an obsolete CVE-related dependency bump patch.
third_party/envoy-gateway/patches/0003-Bump-docker-cli-to-v29.2.0.patch Removes an obsolete CVE-related dependency bump patch.
manifests/tigera-operator.yaml Extends operator RBAC to include xmeshes CRD updates.
manifests/tigera-operator-ocp-upgrade.yaml Extends OCP upgrade RBAC to include xmeshes CRD updates.
manifests/ocp/02-role-tigera-operator.yaml Extends OCP role RBAC to include xmeshes CRD updates.
charts/tigera-operator/templates/tigera-operator/02-role-tigera-operator.yaml Extends Helm-templated RBAC to include xmeshes CRD updates.

You can also share your feedback on Copilot code review. Take the survey.

Comment thread third_party/envoy-proxy/Makefile Outdated
ENVOYBINARY_IMAGE ?= quay.io/tigera/envoybinary:v1.35.8-6ddb700081
# TODO: Update with actual envoybinary v1.37.0 image tag once built.
# See https://gateway.envoyproxy.io/news/releases/matrix/ for version compatibility.
ENVOYBINARY_IMAGE ?= quay.io/tigera/envoybinary:v1.37.0-TODO
Comment thread third_party/envoy-proxy/Makefile Outdated
ENVOYBINARY_IMAGE ?= quay.io/tigera/envoybinary:v1.35.8-6ddb700081
# TODO: Update with actual envoybinary v1.37.0 image tag once built.
# See https://gateway.envoyproxy.io/news/releases/matrix/ for version compatibility.
ENVOYBINARY_IMAGE ?= quay.io/tigera/envoybinary:v1.37.0-TODO
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Please replace this as soon as the image is available

Copy link
Copy Markdown
Member

@electricjesus electricjesus left a comment

Choose a reason for hiding this comment

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

Sorry I selected the wrong review option - was supposed to block because of the TODO image!

v1.37.0 has a broken Bazel dependency checksum (colm repo rename).
v1.37.1 includes the fix plus 5 security CVE patches.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Copy link
Copy Markdown
Member

@electricjesus electricjesus left a comment

Choose a reason for hiding this comment

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

I replaced the TODOs. should be good to go

@electricjesus electricjesus merged commit 01881ff into projectcalico:master Mar 27, 2026
3 of 4 checks passed
MichalFupso pushed a commit to MichalFupso/calico that referenced this pull request Apr 15, 2026
stevegaossou pushed a commit that referenced this pull request Apr 15, 2026
* Bump go 1.25.9 k8s 1.35.3

* Merge pull request #12168 from pasanw/pasan/bump-envoy-gateway-1.7.0

* Merge pull request #12426 from MichalFupso/cve-update-3.31

* Bump envoy dependencies

* make generate

* Update rust version

---------

Co-authored-by: Seth Malaki <seth@projectcalico.org>
Co-authored-by: marvin-tigera <marvin-tigera@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

docs-pr-required Change is not yet documented release-note-required Change has user-facing impact (no matter how small)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants