Skip to content

Commit 015bf78

Browse files
author
Arko Dasgupta
committed
Use / to create internal IR names instead of -
* Also had to replace `/` with `-` when creating K8s resource names :) Fixes: #1640 Signed-off-by: Arko Dasgupta <[email protected]>
1 parent b205456 commit 015bf78

File tree

167 files changed

+912
-909
lines changed

Some content is hidden

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

167 files changed

+912
-909
lines changed

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"xds": {
3-
"envoy-gateway-system-eg": {
3+
"envoy-gateway-system/eg": {
44
"configs": [
55
{
66
"@type": "type.googleapis.com/envoy.admin.v3.BootstrapConfigDump",
@@ -183,7 +183,7 @@
183183
{
184184
"endpointConfig": {
185185
"@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
186-
"clusterName": "envoy-gateway-system-backend-rule-0-match-0-www.example.com",
186+
"clusterName": "envoy-gateway-system/backend/rule/0/match/0-www.example.com",
187187
"endpoints": [
188188
{
189189
"lbEndpoints": [
@@ -222,9 +222,9 @@
222222
"ads": {},
223223
"resourceApiVersion": "V3"
224224
},
225-
"serviceName": "envoy-gateway-system-backend-rule-0-match-0-www.example.com"
225+
"serviceName": "envoy-gateway-system/backend/rule/0/match/0-www.example.com"
226226
},
227-
"name": "envoy-gateway-system-backend-rule-0-match-0-www.example.com",
227+
"name": "envoy-gateway-system/backend/rule/0/match/0-www.example.com",
228228
"outlierDetection": {},
229229
"perConnectionBufferLimitBytes": 32768,
230230
"type": "EDS"
@@ -350,7 +350,7 @@
350350
"typedConfig": {
351351
"@type": "type.googleapis.com/envoy.extensions.filters.http.jwt_authn.v3.JwtAuthentication",
352352
"providers": {
353-
"envoy-gateway-system-backend-rule-0-match-0-www.example.com-example": {
353+
"envoy-gateway-system/backend/rule/0/match/0-www.example.com-example": {
354354
"remoteJwks": {
355355
"cacheDuration": "300s",
356356
"httpUri": {
@@ -362,8 +362,8 @@
362362
}
363363
},
364364
"requirementMap": {
365-
"envoy-gateway-system-backend-rule-0-match-0-www.example.com": {
366-
"providerName": "envoy-gateway-system-backend-rule-0-match-0-www.example.com-example"
365+
"envoy-gateway-system/backend/rule/0/match/0-www.example.com": {
366+
"providerName": "envoy-gateway-system/backend/rule/0/match/0-www.example.com-example"
367367
}
368368
}
369369
}
@@ -383,7 +383,7 @@
383383
"ads": {},
384384
"resourceApiVersion": "V3"
385385
},
386-
"routeConfigName": "envoy-gateway-system-eg-http"
386+
"routeConfigName": "envoy-gateway-system/eg/http"
387387
},
388388
"statPrefix": "http",
389389
"upgradeConfigs": [
@@ -396,7 +396,7 @@
396396
}
397397
]
398398
},
399-
"name": "envoy-gateway-system-eg-http",
399+
"name": "envoy-gateway-system/eg/http",
400400
"perConnectionBufferLimitBytes": 32768
401401
}
402402
}
@@ -410,13 +410,13 @@
410410
"routeConfig": {
411411
"@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
412412
"ignorePortInHostMatching": true,
413-
"name": "envoy-gateway-system-eg-http",
413+
"name": "envoy-gateway-system/eg/http",
414414
"virtualHosts": [
415415
{
416416
"domains": [
417417
"*"
418418
],
419-
"name": "envoy-gateway-system-eg-http",
419+
"name": "envoy-gateway-system/eg/http",
420420
"routes": [
421421
{
422422
"match": {
@@ -430,14 +430,14 @@
430430
],
431431
"pathSeparatedPrefix": "/foo"
432432
},
433-
"name": "envoy-gateway-system-backend-rule-0-match-0-www.example.com",
433+
"name": "envoy-gateway-system/backend/rule/0/match/0-www.example.com",
434434
"route": {
435-
"cluster": "envoy-gateway-system-backend-rule-0-match-0-www.example.com"
435+
"cluster": "envoy-gateway-system/backend/rule/0/match/0-www.example.com"
436436
},
437437
"typedPerFilterConfig": {
438438
"envoy.filters.http.jwt_authn": {
439439
"@type": "type.googleapis.com/envoy.extensions.filters.http.jwt_authn.v3.PerRouteConfig",
440-
"requirementName": "envoy-gateway-system-backend-rule-0-match-0-www.example.com"
440+
"requirementName": "envoy-gateway-system/backend/rule/0/match/0-www.example.com"
441441
}
442442
}
443443
}

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
xds:
2-
envoy-gateway-system-eg:
2+
envoy-gateway-system/eg:
33
configs:
44
- '@type': type.googleapis.com/envoy.admin.v3.BootstrapConfigDump
55
bootstrap:
@@ -103,7 +103,7 @@ xds:
103103
dynamicEndpointConfigs:
104104
- endpointConfig:
105105
'@type': type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment
106-
clusterName: envoy-gateway-system-backend-rule-0-match-0-www.example.com
106+
clusterName: envoy-gateway-system/backend/rule/0/match/0-www.example.com
107107
endpoints:
108108
- lbEndpoints:
109109
- endpoint:
@@ -125,8 +125,8 @@ xds:
125125
edsConfig:
126126
ads: {}
127127
resourceApiVersion: V3
128-
serviceName: envoy-gateway-system-backend-rule-0-match-0-www.example.com
129-
name: envoy-gateway-system-backend-rule-0-match-0-www.example.com
128+
serviceName: envoy-gateway-system/backend/rule/0/match/0-www.example.com
129+
name: envoy-gateway-system/backend/rule/0/match/0-www.example.com
130130
outlierDetection: {}
131131
perConnectionBufferLimitBytes: 32768
132132
type: EDS
@@ -208,16 +208,16 @@ xds:
208208
typedConfig:
209209
'@type': type.googleapis.com/envoy.extensions.filters.http.jwt_authn.v3.JwtAuthentication
210210
providers:
211-
envoy-gateway-system-backend-rule-0-match-0-www.example.com-example:
211+
envoy-gateway-system/backend/rule/0/match/0-www.example.com-example:
212212
remoteJwks:
213213
cacheDuration: 300s
214214
httpUri:
215215
cluster: raw_githubusercontent_com_443
216216
timeout: 5s
217217
uri: https://raw.githubusercontent.com/envoyproxy/gateway/main/examples/kubernetes/authn/jwks.json
218218
requirementMap:
219-
envoy-gateway-system-backend-rule-0-match-0-www.example.com:
220-
providerName: envoy-gateway-system-backend-rule-0-match-0-www.example.com-example
219+
envoy-gateway-system/backend/rule/0/match/0-www.example.com:
220+
providerName: envoy-gateway-system/backend/rule/0/match/0-www.example.com-example
221221
- name: envoy.filters.http.router
222222
typedConfig:
223223
'@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
@@ -228,34 +228,34 @@ xds:
228228
configSource:
229229
ads: {}
230230
resourceApiVersion: V3
231-
routeConfigName: envoy-gateway-system-eg-http
231+
routeConfigName: envoy-gateway-system/eg/http
232232
statPrefix: http
233233
upgradeConfigs:
234234
- upgradeType: websocket
235235
useRemoteAddress: true
236-
name: envoy-gateway-system-eg-http
236+
name: envoy-gateway-system/eg/http
237237
perConnectionBufferLimitBytes: 32768
238238
- '@type': type.googleapis.com/envoy.admin.v3.RoutesConfigDump
239239
dynamicRouteConfigs:
240240
- routeConfig:
241241
'@type': type.googleapis.com/envoy.config.route.v3.RouteConfiguration
242242
ignorePortInHostMatching: true
243-
name: envoy-gateway-system-eg-http
243+
name: envoy-gateway-system/eg/http
244244
virtualHosts:
245245
- domains:
246246
- '*'
247-
name: envoy-gateway-system-eg-http
247+
name: envoy-gateway-system/eg/http
248248
routes:
249249
- match:
250250
headers:
251251
- name: :authority
252252
stringMatch:
253253
exact: www.example.com
254254
pathSeparatedPrefix: /foo
255-
name: envoy-gateway-system-backend-rule-0-match-0-www.example.com
255+
name: envoy-gateway-system/backend/rule/0/match/0-www.example.com
256256
route:
257-
cluster: envoy-gateway-system-backend-rule-0-match-0-www.example.com
257+
cluster: envoy-gateway-system/backend/rule/0/match/0-www.example.com
258258
typedPerFilterConfig:
259259
envoy.filters.http.jwt_authn:
260260
'@type': type.googleapis.com/envoy.extensions.filters.http.jwt_authn.v3.PerRouteConfig
261-
requirementName: envoy-gateway-system-backend-rule-0-match-0-www.example.com
261+
requirementName: envoy-gateway-system/backend/rule/0/match/0-www.example.com

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
xds:
2-
envoy-gateway-system-eg:
2+
envoy-gateway-system/eg:
33
'@type': type.googleapis.com/envoy.admin.v3.BootstrapConfigDump
44
bootstrap:
55
admin:

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
xds:
2-
envoy-gateway-system-eg:
2+
envoy-gateway-system/eg:
33
'@type': type.googleapis.com/envoy.admin.v3.ClustersConfigDump
44
dynamicActiveClusters:
55
- cluster:
@@ -12,8 +12,8 @@ xds:
1212
edsConfig:
1313
ads: {}
1414
resourceApiVersion: V3
15-
serviceName: envoy-gateway-system-backend-rule-0-match-0-www.example.com
16-
name: envoy-gateway-system-backend-rule-0-match-0-www.example.com
15+
serviceName: envoy-gateway-system/backend/rule/0/match/0-www.example.com
16+
name: envoy-gateway-system/backend/rule/0/match/0-www.example.com
1717
outlierDetection: {}
1818
perConnectionBufferLimitBytes: 32768
1919
type: EDS

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
xds:
2-
envoy-gateway-system-eg:
2+
envoy-gateway-system/eg:
33
'@type': type.googleapis.com/envoy.admin.v3.ListenersConfigDump
44
dynamicListeners:
55
- activeState:
@@ -47,16 +47,16 @@ xds:
4747
typedConfig:
4848
'@type': type.googleapis.com/envoy.extensions.filters.http.jwt_authn.v3.JwtAuthentication
4949
providers:
50-
envoy-gateway-system-backend-rule-0-match-0-www.example.com-example:
50+
envoy-gateway-system/backend/rule/0/match/0-www.example.com-example:
5151
remoteJwks:
5252
cacheDuration: 300s
5353
httpUri:
5454
cluster: raw_githubusercontent_com_443
5555
timeout: 5s
5656
uri: https://raw.githubusercontent.com/envoyproxy/gateway/main/examples/kubernetes/authn/jwks.json
5757
requirementMap:
58-
envoy-gateway-system-backend-rule-0-match-0-www.example.com:
59-
providerName: envoy-gateway-system-backend-rule-0-match-0-www.example.com-example
58+
envoy-gateway-system/backend/rule/0/match/0-www.example.com:
59+
providerName: envoy-gateway-system/backend/rule/0/match/0-www.example.com-example
6060
- name: envoy.filters.http.router
6161
typedConfig:
6262
'@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
@@ -67,10 +67,10 @@ xds:
6767
configSource:
6868
ads: {}
6969
resourceApiVersion: V3
70-
routeConfigName: envoy-gateway-system-eg-http
70+
routeConfigName: envoy-gateway-system/eg/http
7171
statPrefix: http
7272
upgradeConfigs:
7373
- upgradeType: websocket
7474
useRemoteAddress: true
75-
name: envoy-gateway-system-eg-http
75+
name: envoy-gateway-system/eg/http
7676
perConnectionBufferLimitBytes: 32768

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
xds:
2-
envoy-gateway-system-eg:
2+
envoy-gateway-system/eg:
33
'@type': type.googleapis.com/envoy.admin.v3.RoutesConfigDump
44
dynamicRouteConfigs:
55
- routeConfig:
66
'@type': type.googleapis.com/envoy.config.route.v3.RouteConfiguration
77
ignorePortInHostMatching: true
8-
name: envoy-gateway-system-eg-http
8+
name: envoy-gateway-system/eg/http
99
virtualHosts:
1010
- domains:
1111
- '*'
12-
name: envoy-gateway-system-eg-http
12+
name: envoy-gateway-system/eg/http
1313
routes:
1414
- match:
1515
headers:
1616
- name: :authority
1717
stringMatch:
1818
exact: www.example.com
1919
pathSeparatedPrefix: /foo
20-
name: envoy-gateway-system-backend-rule-0-match-0-www.example.com
20+
name: envoy-gateway-system/backend/rule/0/match/0-www.example.com
2121
route:
22-
cluster: envoy-gateway-system-backend-rule-0-match-0-www.example.com
22+
cluster: envoy-gateway-system/backend/rule/0/match/0-www.example.com
2323
typedPerFilterConfig:
2424
envoy.filters.http.jwt_authn:
2525
'@type': type.googleapis.com/envoy.extensions.filters.http.jwt_authn.v3.PerRouteConfig
26-
requirementName: envoy-gateway-system-backend-rule-0-match-0-www.example.com
26+
requirementName: envoy-gateway-system/backend/rule/0/match/0-www.example.com

0 commit comments

Comments
 (0)