Skip to content

Commit 3eb3301

Browse files
guydcguydc
authored
Merge commit from fork
Signed-off-by: Guy Daich <[email protected]>
1 parent 7813ef0 commit 3eb3301

File tree

57 files changed

+272
-53
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+272
-53
lines changed

‎internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml

+10-2
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ envoyProxyForGatewayClass:
5252
typed_config:
5353
"@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
5454
stat_prefix: eg-ready-http
55+
normalize_path: true
5556
route_config:
5657
name: local_route
5758
virtual_hosts:
@@ -60,7 +61,10 @@ envoyProxyForGatewayClass:
6061
- "*"
6162
routes:
6263
- match:
63-
prefix: /stats/prometheus
64+
path: /stats/prometheus
65+
headers:
66+
- name: ":method"
67+
exact_match: GET
6468
route:
6569
cluster: prometheus_stats
6670
http_filters:
@@ -677,6 +681,7 @@ xds:
677681
- name: envoy.filters.http.router
678682
typedConfig:
679683
'@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
684+
normalizePath: true
680685
routeConfig:
681686
name: local_route
682687
virtualHosts:
@@ -685,7 +690,10 @@ xds:
685690
name: prometheus_stats
686691
routes:
687692
- match:
688-
prefix: /stats/prometheus
693+
headers:
694+
- exactMatch: GET
695+
name: :method
696+
path: /stats/prometheus
689697
route:
690698
cluster: prometheus_stats
691699
statPrefix: eg-ready-http

‎internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json

+8-1
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,7 @@
268268
}
269269
}
270270
],
271+
"normalizePath": true,
271272
"routeConfig": {
272273
"name": "local_route",
273274
"virtualHosts": [
@@ -279,7 +280,13 @@
279280
"routes": [
280281
{
281282
"match": {
282-
"prefix": "/stats/prometheus"
283+
"headers": [
284+
{
285+
"exactMatch": "GET",
286+
"name": ":method"
287+
}
288+
],
289+
"path": "/stats/prometheus"
283290
},
284291
"route": {
285292
"cluster": "prometheus_stats"

‎internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml

+5-1
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ xds:
156156
- name: envoy.filters.http.router
157157
typedConfig:
158158
'@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
159+
normalizePath: true
159160
routeConfig:
160161
name: local_route
161162
virtualHosts:
@@ -164,7 +165,10 @@ xds:
164165
name: prometheus_stats
165166
routes:
166167
- match:
167-
prefix: /stats/prometheus
168+
headers:
169+
- exactMatch: GET
170+
name: :method
171+
path: /stats/prometheus
168172
route:
169173
cluster: prometheus_stats
170174
statPrefix: eg-ready-http

‎internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.bootstrap.yaml

+5-1
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ xds:
155155
- name: envoy.filters.http.router
156156
typedConfig:
157157
'@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
158+
normalizePath: true
158159
routeConfig:
159160
name: local_route
160161
virtualHosts:
@@ -163,7 +164,10 @@ xds:
163164
name: prometheus_stats
164165
routes:
165166
- match:
166-
prefix: /stats/prometheus
167+
headers:
168+
- exactMatch: GET
169+
name: :method
170+
path: /stats/prometheus
167171
route:
168172
cluster: prometheus_stats
169173
statPrefix: eg-ready-http

‎internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.json

+8-1
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,7 @@
268268
}
269269
}
270270
],
271+
"normalizePath": true,
271272
"routeConfig": {
272273
"name": "local_route",
273274
"virtualHosts": [
@@ -279,7 +280,13 @@
279280
"routes": [
280281
{
281282
"match": {
282-
"prefix": "/stats/prometheus"
283+
"headers": [
284+
{
285+
"exactMatch": "GET",
286+
"name": ":method"
287+
}
288+
],
289+
"path": "/stats/prometheus"
283290
},
284291
"route": {
285292
"cluster": "prometheus_stats"

‎internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.yaml

+5-1
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ xds:
156156
- name: envoy.filters.http.router
157157
typedConfig:
158158
'@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
159+
normalizePath: true
159160
routeConfig:
160161
name: local_route
161162
virtualHosts:
@@ -164,7 +165,10 @@ xds:
164165
name: prometheus_stats
165166
routes:
166167
- match:
167-
prefix: /stats/prometheus
168+
headers:
169+
- exactMatch: GET
170+
name: :method
171+
path: /stats/prometheus
168172
route:
169173
cluster: prometheus_stats
170174
statPrefix: eg-ready-http

‎internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.bootstrap.yaml

+5-1
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ xds:
155155
- name: envoy.filters.http.router
156156
typedConfig:
157157
'@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
158+
normalizePath: true
158159
routeConfig:
159160
name: local_route
160161
virtualHosts:
@@ -163,7 +164,10 @@ xds:
163164
name: prometheus_stats
164165
routes:
165166
- match:
166-
prefix: /stats/prometheus
167+
headers:
168+
- exactMatch: GET
169+
name: :method
170+
path: /stats/prometheus
167171
route:
168172
cluster: prometheus_stats
169173
statPrefix: eg-ready-http

‎internal/cmd/egctl/testdata/translate/out/no-service-cluster-ip.all.yaml

+5-1
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ xds:
156156
- name: envoy.filters.http.router
157157
typedConfig:
158158
'@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
159+
normalizePath: true
159160
routeConfig:
160161
name: local_route
161162
virtualHosts:
@@ -164,7 +165,10 @@ xds:
164165
name: prometheus_stats
165166
routes:
166167
- match:
167-
prefix: /stats/prometheus
168+
headers:
169+
- exactMatch: GET
170+
name: :method
171+
path: /stats/prometheus
168172
route:
169173
cluster: prometheus_stats
170174
statPrefix: eg-ready-http

‎internal/infrastructure/kubernetes/proxy/testdata/daemonsets/custom.yaml

+5-1
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ spec:
8484
typed_config:
8585
"@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
8686
stat_prefix: eg-ready-http
87+
normalize_path: true
8788
route_config:
8889
name: local_route
8990
virtual_hosts:
@@ -92,7 +93,10 @@ spec:
9293
- "*"
9394
routes:
9495
- match:
95-
prefix: /stats/prometheus
96+
path: /stats/prometheus
97+
headers:
98+
- name: ":method"
99+
exact_match: GET
96100
route:
97101
cluster: prometheus_stats
98102
http_filters:

‎internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default-env.yaml

+5-1
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ spec:
8383
typed_config:
8484
"@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
8585
stat_prefix: eg-ready-http
86+
normalize_path: true
8687
route_config:
8788
name: local_route
8889
virtual_hosts:
@@ -91,7 +92,10 @@ spec:
9192
- "*"
9293
routes:
9394
- match:
94-
prefix: /stats/prometheus
95+
path: /stats/prometheus
96+
headers:
97+
- name: ":method"
98+
exact_match: GET
9599
route:
96100
cluster: prometheus_stats
97101
http_filters:

‎internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default.yaml

+5-1
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ spec:
8383
typed_config:
8484
"@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
8585
stat_prefix: eg-ready-http
86+
normalize_path: true
8687
route_config:
8788
name: local_route
8889
virtual_hosts:
@@ -91,7 +92,10 @@ spec:
9192
- "*"
9293
routes:
9394
- match:
94-
prefix: /stats/prometheus
95+
path: /stats/prometheus
96+
headers:
97+
- name: ":method"
98+
exact_match: GET
9599
route:
96100
cluster: prometheus_stats
97101
http_filters:

‎internal/infrastructure/kubernetes/proxy/testdata/daemonsets/disable-prometheus.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ spec:
7979
typed_config:
8080
"@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
8181
stat_prefix: eg-ready-http
82+
normalize_path: true
8283
route_config:
8384
name: local_route
8485
http_filters:

‎internal/infrastructure/kubernetes/proxy/testdata/daemonsets/extension-env.yaml

+5-1
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ spec:
8383
typed_config:
8484
"@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
8585
stat_prefix: eg-ready-http
86+
normalize_path: true
8687
route_config:
8788
name: local_route
8889
virtual_hosts:
@@ -91,7 +92,10 @@ spec:
9192
- "*"
9293
routes:
9394
- match:
94-
prefix: /stats/prometheus
95+
path: /stats/prometheus
96+
headers:
97+
- name: ":method"
98+
exact_match: GET
9599
route:
96100
cluster: prometheus_stats
97101
http_filters:

‎internal/infrastructure/kubernetes/proxy/testdata/daemonsets/override-labels-and-annotations.yaml

+5-1
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ spec:
9292
typed_config:
9393
"@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
9494
stat_prefix: eg-ready-http
95+
normalize_path: true
9596
route_config:
9697
name: local_route
9798
virtual_hosts:
@@ -100,7 +101,10 @@ spec:
100101
- "*"
101102
routes:
102103
- match:
103-
prefix: /stats/prometheus
104+
path: /stats/prometheus
105+
headers:
106+
- name: ":method"
107+
exact_match: GET
104108
route:
105109
cluster: prometheus_stats
106110
http_filters:

‎internal/infrastructure/kubernetes/proxy/testdata/daemonsets/patch-daemonset.yaml

+5-1
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ spec:
8383
typed_config:
8484
"@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
8585
stat_prefix: eg-ready-http
86+
normalize_path: true
8687
route_config:
8788
name: local_route
8889
virtual_hosts:
@@ -91,7 +92,10 @@ spec:
9192
- "*"
9293
routes:
9394
- match:
94-
prefix: /stats/prometheus
95+
path: /stats/prometheus
96+
headers:
97+
- name: ":method"
98+
exact_match: GET
9599
route:
96100
cluster: prometheus_stats
97101
http_filters:

‎internal/infrastructure/kubernetes/proxy/testdata/daemonsets/shutdown-manager.yaml

+5-1
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ spec:
8383
typed_config:
8484
"@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
8585
stat_prefix: eg-ready-http
86+
normalize_path: true
8687
route_config:
8788
name: local_route
8889
virtual_hosts:
@@ -91,7 +92,10 @@ spec:
9192
- "*"
9293
routes:
9394
- match:
94-
prefix: /stats/prometheus
95+
path: /stats/prometheus
96+
headers:
97+
- name: ":method"
98+
exact_match: GET
9599
route:
96100
cluster: prometheus_stats
97101
http_filters:

‎internal/infrastructure/kubernetes/proxy/testdata/daemonsets/volumes.yaml

+5-1
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ spec:
8383
typed_config:
8484
"@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
8585
stat_prefix: eg-ready-http
86+
normalize_path: true
8687
route_config:
8788
name: local_route
8889
virtual_hosts:
@@ -91,7 +92,10 @@ spec:
9192
- "*"
9293
routes:
9394
- match:
94-
prefix: /stats/prometheus
95+
path: /stats/prometheus
96+
headers:
97+
- name: ":method"
98+
exact_match: GET
9599
route:
96100
cluster: prometheus_stats
97101
http_filters:

‎internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-annotations.yaml

+5-1
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ spec:
8888
typed_config:
8989
"@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
9090
stat_prefix: eg-ready-http
91+
normalize_path: true
9192
route_config:
9293
name: local_route
9394
virtual_hosts:
@@ -96,7 +97,10 @@ spec:
9697
- "*"
9798
routes:
9899
- match:
99-
prefix: /stats/prometheus
100+
path: /stats/prometheus
101+
headers:
102+
- name: ":method"
103+
exact_match: GET
100104
route:
101105
cluster: prometheus_stats
102106
http_filters:

‎internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-extra-args.yaml

+5-1
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ spec:
8383
typed_config:
8484
"@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
8585
stat_prefix: eg-ready-http
86+
normalize_path: true
8687
route_config:
8788
name: local_route
8889
virtual_hosts:
@@ -91,7 +92,10 @@ spec:
9192
- "*"
9293
routes:
9394
- match:
94-
prefix: /stats/prometheus
95+
path: /stats/prometheus
96+
headers:
97+
- name: ":method"
98+
exact_match: GET
9599
route:
96100
cluster: prometheus_stats
97101
http_filters:

0 commit comments

Comments
 (0)