Skip to content

feat: Support for merged EnvoyProxy settings#8169

Open
mgs255 wants to merge 2 commits intoenvoyproxy:mainfrom
PulseInnovations:envoy-proxy-defaults-add-merge
Open

feat: Support for merged EnvoyProxy settings#8169
mgs255 wants to merge 2 commits intoenvoyproxy:mainfrom
PulseInnovations:envoy-proxy-defaults-add-merge

Conversation

@mgs255
Copy link
Contributor

@mgs255 mgs255 commented Feb 3, 2026

This commit is a continuation of the previous work to support supplying default proxy settings on the top level EnvoyGatewaySpec. It also introduces the existing MergeType option on the EnvoyProxySpec

With this change it is now possible to define default proxy settings as part of the envoy-gateway configuration, and have those settings overridden by GatewayClass or Gateway referenced EnvoyProxy instances. Note that the default behavior will be that more specific proxy settings will replace those defaults.

MergeType Options:

  • Replace (default) - More specific config completely replaces less specific config
  • StrategicMerge - Kubernetes-style strategic merge patch
  • JSONMerge - RFC 7396 JSON merge patch

Priority Order (highest to lowest):

  1. Gateway-level EnvoyProxy (via parametersRef)
  2. GatewayClass-level EnvoyProxy
  3. Default EnvoyProxySpec from EnvoyGateway configuration

Release Notes: Yes

Towards: #4764

@netlify
Copy link

netlify bot commented Feb 3, 2026

Deploy Preview for cerulean-figolla-1f9435 canceled.

Name Link
🔨 Latest commit 3126bb4
🔍 Latest deploy log https://app.netlify.com/projects/cerulean-figolla-1f9435/deploys/6989ac1db3227b000821800d

@codecov
Copy link

codecov bot commented Feb 3, 2026

Codecov Report

❌ Patch coverage is 80.51948% with 15 lines in your changes missing coverage. Please review.
✅ Project coverage is 73.81%. Comparing base (5c2075b) to head (ddaf648).

Files with missing lines Patch % Lines
internal/gatewayapi/envoyproxy_merge.go 75.51% 9 Missing and 3 partials ⚠️
internal/gatewayapi/translator.go 50.00% 1 Missing and 2 partials ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##             main    #8169   +/-   ##
=======================================
  Coverage   73.81%   73.81%           
=======================================
  Files         241      242    +1     
  Lines       36608    36675   +67     
=======================================
+ Hits        27021    27073   +52     
- Misses       7681     7691   +10     
- Partials     1906     1911    +5     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@mgs255 mgs255 force-pushed the envoy-proxy-defaults-add-merge branch 6 times, most recently from beba8a7 to f7941fb Compare February 8, 2026 17:31
@mgs255 mgs255 changed the title feat: envoy proxy defaults - add merging feat: Support for merged EnvoyProxy settings Feb 8, 2026
@mgs255 mgs255 force-pushed the envoy-proxy-defaults-add-merge branch from f7941fb to d2d5054 Compare February 8, 2026 17:44
@mgs255 mgs255 marked this pull request as ready for review February 8, 2026 17:50
@mgs255 mgs255 requested a review from a team as a code owner February 8, 2026 17:50
This commit is a continuation of the previous work to support supplying
default proxy settings on the top level EnvoyGatewaySpec. It also introduces
a the existing `MergeType` option on the `EnvoyProxySpec`.

With this change it is now possible to define default proxy settings as part
of the envoy-gateway configuration, and have those settings overridden by
GatewayClass or Gateway referenced EnvoyProxy instances. Note that the
default behavior will be that more specific proxy settings will replace those
defaults.

MergeType Options:
- `Replace` (default) - More specific config completely replaces less specific config
- `StrategicMerge` - Kubernetes-style strategic merge patch
- `JSONMerge` - RFC 7396 JSON merge patch

Priority Order (highest to lowest):
1. Gateway-level EnvoyProxy (via `parametersRef`)
2. GatewayClass-level EnvoyProxy
3. Default EnvoyProxySpec from EnvoyGateway configuration

Towards: envoyproxy#4764
Signed-off-by: Michael Sommerville <[email protected]>
@mgs255 mgs255 force-pushed the envoy-proxy-defaults-add-merge branch 2 times, most recently from 2fe2d68 to a990589 Compare February 9, 2026 08:12
@mgs255 mgs255 marked this pull request as draft February 9, 2026 08:34
@mgs255 mgs255 force-pushed the envoy-proxy-defaults-add-merge branch from a990589 to ddaf648 Compare February 9, 2026 08:39
Signed-off-by: Michael Sommerville <[email protected]>
@mgs255 mgs255 force-pushed the envoy-proxy-defaults-add-merge branch from ddaf648 to 3126bb4 Compare February 9, 2026 09:42
@mgs255 mgs255 marked this pull request as ready for review February 9, 2026 11:56
@mgs255
Copy link
Contributor Author

mgs255 commented Feb 9, 2026

After a bit of a faf these failing tests with Kubebuilder setup on Mac these coverage-tests pass locally.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant