Repository navigation
[v3.23] fix(gatewayapi): mount the trust bundle on envoy-proxy at Envoy Gateway's system CA path - #5392
Merged
rene-dekker merged 4 commits intoNov 9, 2026
Conversation
…bundle feat(gatewayapi): mount operator trust bundle on envoy-gateway and envoy-proxy [v1.42: release branch names the installation spec "installation", not "installationSpec".] (cherry picked from commit e6ae3b3)
Envoy Gateway reads the system CA bundle for BackendTLSPolicy wellKnownCACertificates: System from /etc/ssl/certs/ca-certificates.crt. The envoy-proxy pods already mount the operator's trust bundle, but only under /etc/pki/tls, so System validation failed with "Secret rejected: Invalid path". Also mount the bundle's system roots file at that path. Refs CI-2088
…roxy Envoy Gateway merges the envoy container's volumeMounts by volume name. All the trust bundle mounts used the same volume, tigera-ca-bundle, so only the last one reached the pod. The /etc/pki/tls/certs mount was already being dropped, and the new /etc/ssl/certs mount dropped /etc/pki/tls/cert.pem. Give each mount its own volume over the same ConfigMap. Refs CI-2088
The bundle hash annotations were only set on the envoy-gateway controller. subPath mounts never refresh in place, so a bundle change never reached running proxy pods. Set the annotations on the proxy pod template too. Refs CI-2088
rene-dekker
approved these changes
Nov 9, 2026
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
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.
Description
Cherry-pick of #4796 plus https://github.com/tigera/calico-private/pull/15309 (operator/ commits, still in review on master) for Calico Enterprise v3.23.
Bug fix. A BackendTLSPolicy with
wellKnownCACertificates: Systemfails on Calico Ingress Gateway. Envoy logsSecret rejected: Invalid path: /etc/ssl/certs/ca-certificates.crt. Envoy Gateway hard-codes that path, and the envoy-proxy image has no CA bundle.release-v1.42never mounted the operator trust bundle on the gateway pods, so this brings in #4796 first. Then the three commits from calico-private 15309:ca-bundle.crt(public roots) at/etc/ssl/certs/ca-certificates.crton envoy-proxy.tigera-ca-bundlecollapse to the last one.Backport notes:
-m 1. One conflict ingateway_api_test.go(kept the release branch's tests, added only feat(gatewayapi): mount operator trust bundle on envoy-gateway and envoy-proxy #4796's test). The controller usesinstallationhere instead ofinstallationSpec.release-v1.42does not have the emSign root filter yet, so on this branch the bundle still carries those roots.Testing:
go test ./pkg/render/gatewayapi/ ./pkg/controller/gatewayapi/passes on this branch. The render test checks that every bundle mount has its own volume, that all three paths are present, and that the proxy pod carries the hash annotations.Systemto a public HTTPS backend returns 200, and a wrong policy hostname returns 503. The proxy pod has all three bundle paths. Rotating the Calico CA changed the proxy's hash annotation and rolled the proxy pods.2026-11-07-v3-23-comfort(v3.23.4 dev-48, Envoy Gateway 1.9.1, Gateway API v1.6.1), on Kubernetes v1.32.11. The test operator is this branch, with every component pinned to that hashrelease, so it differs from the hashrelease operator only by these commits. Same Gateway -> public HTTPS backend -> BackendTLSPolicySystem:Secret rejected: Invalid path: /etc/ssl/certs/ca-certificates.crt.Secret rejectedlines. A wrong policy hostname gives 503.Refs CI-2088
This PR was written in part with the assistance of generative AI.
Release Note
For PR author
make gen-files(N/A, no pkg/apis changes)make gen-versions(N/A, no version changes)For PR reviewers
A note for code reviewers - all pull requests must have the following:
kind/bugif this is a bugfix.kind/enhancementif this is a a new feature.enterpriseif this PR applies to Calico Enterprise only.