Skip to content

Commit

Permalink
bug: Fix merge race (envoyproxy#2628)
Browse files Browse the repository at this point in the history
Fix merge race

Between envoyproxy#2566

&

envoyproxy#2585

Signed-off-by: Arko Dasgupta <[email protected]>
Signed-off-by: Stéphane Cottin <[email protected]>
  • Loading branch information
arkodg authored and vixns committed Feb 18, 2024
1 parent 61389d5 commit 1f787ac
Showing 1 changed file with 4 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
- name: envoy.filters.http.router
typedConfig:
'@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
suppressEnvoyHeaders: true
normalizePath: true
originalIpDetectionExtensions:
- name: envoy.extensions.http.original_ip_detection.custom_header
Expand All @@ -63,6 +64,7 @@
ads: {}
resourceApiVersion: V3
routeConfigName: second-listener
serverHeaderTransformation: PASS_THROUGH
statPrefix: http
upgradeConfigs:
- upgradeType: websocket
Expand All @@ -88,6 +90,7 @@
- name: envoy.filters.http.router
typedConfig:
'@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
suppressEnvoyHeaders: true
normalizePath: true
originalIpDetectionExtensions:
- name: envoy.extensions.http.original_ip_detection.custom_header
Expand All @@ -102,6 +105,7 @@
ads: {}
resourceApiVersion: V3
routeConfigName: third-listener
serverHeaderTransformation: PASS_THROUGH
statPrefix: http
upgradeConfigs:
- upgradeType: websocket
Expand Down

0 comments on commit 1f787ac

Please sign in to comment.