feat: Add EnvoyProxyTemplate for global Envoy Proxy defaults #7698
+1,546
−20
Conversation
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
mgs255
force-pushed
the
allow-provide-default-proxy-image
branch
2 times, most recently
from
7da24bf to
02beef5
Compare
zirain
reviewed
Dec 8, 2025
mgs255
force-pushed
the
allow-provide-default-proxy-image
branch
2 times, most recently
from
fc0c5b9 to
fd2a520
Compare
Introduce EnvoyProxyTemplate in EnvoyGateway provider configuration to
define default settings for all Envoy Proxy deployments. Individual
EnvoyProxy resource settings take precedence over these template defaults.
This change includes:
* Add EnvoyProxyTemplate field to EnvoyGatewayKubernetesProvider API
* Implement merge functions for combining template defaults with more specific configurations
- Container specs (image, env vars, resources, volume mounts)
- Pod specs (annotations, labels, volumes, tolerations, affinity)
* Extend helm chart to support configuring default Envoy Proxy image settings via new
envoyProxyTemplate object.
* Add unit tests for merge logic
Signed-off-by: Michael Sommerville <[email protected]>
mgs255
force-pushed
the
allow-provide-default-proxy-image
branch
from
fd2a520 to
0ae8e1d
Compare
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #7698 +/- ##
==========================================
+ Coverage 72.29% 72.34% +0.05%
==========================================
Files 234 234
Lines 34480 34630 +150
==========================================
+ Hits 24927 25053 +126
- Misses 7765 7775 +10
- Partials 1788 1802 +14 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
zirain
reviewed
Dec 11, 2025
| pullPolicy: IfNotPresent | ||
| # List of secrets in the same namespace of the component that can be used to pull images from private repositories. | ||
| pullSecrets: [] | ||
| envoyProxy: |
Member
There was a problem hiding this comment.
can you split this into a separated PR? let keep a PR as small as possible.
arkodg
reviewed
Dec 11, 2025
| // +optional | ||
| ImageRepository *string `json:"imageRepository,omitempty"` | ||
|
|
||
| // ImagePullPolicy specifies the pull policy for the container image. |
Contributor
There was a problem hiding this comment.
can this be removed from this PR
arkodg
reviewed
Dec 11, 2025
| // EnvoyProxy-specific config takes precedence over global defaults. The default proxy image | ||
| // is passed as MergeContainerDefaults will override that image with that specified on the | ||
| // template. | ||
| func (r *ResourceRender) mergeContainerDefaults(containerSpec *egv1a1.KubernetesContainerSpec) *egv1a1.KubernetesContainerSpec { |
Contributor
There was a problem hiding this comment.
instead of writing our own merge functions, imo lets rely on something like strategic merge
gateway/internal/utils/merge.go
Line 66 in 88ee096
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
Add EnvoyProxyTemplate for global Envoy Proxy defaults
Introduce EnvoyProxyTemplate in EnvoyGateway provider configuration to define default settings for all Envoy Proxy deployments. Individual EnvoyProxy resource settings take precedence over these template defaults.
This change includes:
envoyProxyTemplate object.
Fixes: #4764