Skip to content

Commit b32b48f

Browse files
committed
fix test
Signed-off-by: Huabing (Robin) Zhao <zhaohuabing@gmail.com>
1 parent 07077ca commit b32b48f

16 files changed

+184
-13
lines changed

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1126,6 +1126,14 @@ xds:
11261126
useRemoteAddress: true
11271127
name: default/eg/http
11281128
maxConnectionsToAcceptPerSocketEvent: 1
1129+
metadata:
1130+
filterMetadata:
1131+
envoy-gateway:
1132+
resources:
1133+
- kind: Gateway
1134+
name: eg
1135+
namespace: default
1136+
sectionName: http
11291137
name: 0.0.0.0-10080
11301138
perConnectionBufferLimitBytes: 32768
11311139
- activeState:
@@ -1238,6 +1246,14 @@ xds:
12381246
useRemoteAddress: true
12391247
name: default/eg/grpc
12401248
maxConnectionsToAcceptPerSocketEvent: 1
1249+
metadata:
1250+
filterMetadata:
1251+
envoy-gateway:
1252+
resources:
1253+
- kind: Gateway
1254+
name: eg
1255+
namespace: default
1256+
sectionName: grpc
12411257
name: 0.0.0.0-8080
12421258
perConnectionBufferLimitBytes: 32768
12431259
- activeState:
@@ -1322,6 +1338,10 @@ xds:
13221338
statPrefix: tcp-1234
13231339
name: tcproute/default/backend
13241340
maxConnectionsToAcceptPerSocketEvent: 1
1341+
metadata:
1342+
filterMetadata:
1343+
envoy-gateway:
1344+
resources: []
13251345
name: 0.0.0.0-1234
13261346
perConnectionBufferLimitBytes: 32768
13271347
- activeState:
@@ -1413,6 +1433,10 @@ xds:
14131433
typedConfig:
14141434
'@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector
14151435
maxConnectionsToAcceptPerSocketEvent: 1
1436+
metadata:
1437+
filterMetadata:
1438+
envoy-gateway:
1439+
resources: []
14161440
name: 0.0.0.0-8443
14171441
perConnectionBufferLimitBytes: 32768
14181442
- activeState:

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

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -978,6 +978,20 @@
978978
"name": "default/eg/http"
979979
},
980980
"maxConnectionsToAcceptPerSocketEvent": 1,
981+
"metadata": {
982+
"filterMetadata": {
983+
"envoy-gateway": {
984+
"resources": [
985+
{
986+
"kind": "Gateway",
987+
"name": "eg",
988+
"namespace": "default",
989+
"sectionName": "http"
990+
}
991+
]
992+
}
993+
}
994+
},
981995
"name": "0.0.0.0-10080",
982996
"perConnectionBufferLimitBytes": 32768
983997
}
@@ -1130,6 +1144,20 @@
11301144
"name": "default/eg/grpc"
11311145
},
11321146
"maxConnectionsToAcceptPerSocketEvent": 1,
1147+
"metadata": {
1148+
"filterMetadata": {
1149+
"envoy-gateway": {
1150+
"resources": [
1151+
{
1152+
"kind": "Gateway",
1153+
"name": "eg",
1154+
"namespace": "default",
1155+
"sectionName": "grpc"
1156+
}
1157+
]
1158+
}
1159+
}
1160+
},
11331161
"name": "0.0.0.0-8080",
11341162
"perConnectionBufferLimitBytes": 32768
11351163
}
@@ -1242,6 +1270,13 @@
12421270
}
12431271
],
12441272
"maxConnectionsToAcceptPerSocketEvent": 1,
1273+
"metadata": {
1274+
"filterMetadata": {
1275+
"envoy-gateway": {
1276+
"resources": []
1277+
}
1278+
}
1279+
},
12451280
"name": "0.0.0.0-1234",
12461281
"perConnectionBufferLimitBytes": 32768
12471282
}
@@ -1367,6 +1402,13 @@
13671402
}
13681403
],
13691404
"maxConnectionsToAcceptPerSocketEvent": 1,
1405+
"metadata": {
1406+
"filterMetadata": {
1407+
"envoy-gateway": {
1408+
"resources": []
1409+
}
1410+
}
1411+
},
13701412
"name": "0.0.0.0-8443",
13711413
"perConnectionBufferLimitBytes": 32768
13721414
}

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -579,6 +579,14 @@ xds:
579579
useRemoteAddress: true
580580
name: default/eg/http
581581
maxConnectionsToAcceptPerSocketEvent: 1
582+
metadata:
583+
filterMetadata:
584+
envoy-gateway:
585+
resources:
586+
- kind: Gateway
587+
name: eg
588+
namespace: default
589+
sectionName: http
582590
name: 0.0.0.0-10080
583591
perConnectionBufferLimitBytes: 32768
584592
- activeState:
@@ -691,6 +699,14 @@ xds:
691699
useRemoteAddress: true
692700
name: default/eg/grpc
693701
maxConnectionsToAcceptPerSocketEvent: 1
702+
metadata:
703+
filterMetadata:
704+
envoy-gateway:
705+
resources:
706+
- kind: Gateway
707+
name: eg
708+
namespace: default
709+
sectionName: grpc
694710
name: 0.0.0.0-8080
695711
perConnectionBufferLimitBytes: 32768
696712
- activeState:
@@ -775,6 +791,10 @@ xds:
775791
statPrefix: tcp-1234
776792
name: tcproute/default/backend
777793
maxConnectionsToAcceptPerSocketEvent: 1
794+
metadata:
795+
filterMetadata:
796+
envoy-gateway:
797+
resources: []
778798
name: 0.0.0.0-1234
779799
perConnectionBufferLimitBytes: 32768
780800
- activeState:
@@ -866,6 +886,10 @@ xds:
866886
typedConfig:
867887
'@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector
868888
maxConnectionsToAcceptPerSocketEvent: 1
889+
metadata:
890+
filterMetadata:
891+
envoy-gateway:
892+
resources: []
869893
name: 0.0.0.0-8443
870894
perConnectionBufferLimitBytes: 32768
871895
- activeState:

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,14 @@ xds:
143143
useRemoteAddress: true
144144
name: default/eg/http
145145
maxConnectionsToAcceptPerSocketEvent: 1
146+
metadata:
147+
filterMetadata:
148+
envoy-gateway:
149+
resources:
150+
- kind: Gateway
151+
name: eg
152+
namespace: default
153+
sectionName: http
146154
name: 0.0.0.0-10080
147155
perConnectionBufferLimitBytes: 32768
148156
- activeState:
@@ -255,6 +263,14 @@ xds:
255263
useRemoteAddress: true
256264
name: default/eg/grpc
257265
maxConnectionsToAcceptPerSocketEvent: 1
266+
metadata:
267+
filterMetadata:
268+
envoy-gateway:
269+
resources:
270+
- kind: Gateway
271+
name: eg
272+
namespace: default
273+
sectionName: grpc
258274
name: 0.0.0.0-8080
259275
perConnectionBufferLimitBytes: 32768
260276
- activeState:
@@ -339,6 +355,10 @@ xds:
339355
statPrefix: tcp-1234
340356
name: tcproute/default/backend
341357
maxConnectionsToAcceptPerSocketEvent: 1
358+
metadata:
359+
filterMetadata:
360+
envoy-gateway:
361+
resources: []
342362
name: 0.0.0.0-1234
343363
perConnectionBufferLimitBytes: 32768
344364
- activeState:
@@ -430,6 +450,10 @@ xds:
430450
typedConfig:
431451
'@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector
432452
maxConnectionsToAcceptPerSocketEvent: 1
453+
metadata:
454+
filterMetadata:
455+
envoy-gateway:
456+
resources: []
433457
name: 0.0.0.0-8443
434458
perConnectionBufferLimitBytes: 32768
435459
- activeState:

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -689,6 +689,20 @@
689689
"name": "envoy-gateway-system/eg/http"
690690
},
691691
"maxConnectionsToAcceptPerSocketEvent": 1,
692+
"metadata": {
693+
"filterMetadata": {
694+
"envoy-gateway": {
695+
"resources": [
696+
{
697+
"kind": "Gateway",
698+
"name": "eg",
699+
"namespace": "envoy-gateway-system",
700+
"sectionName": "http"
701+
}
702+
]
703+
}
704+
}
705+
},
692706
"name": "0.0.0.0-10080",
693707
"perConnectionBufferLimitBytes": 32768
694708
}

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -417,6 +417,14 @@ xds:
417417
useRemoteAddress: true
418418
name: envoy-gateway-system/eg/http
419419
maxConnectionsToAcceptPerSocketEvent: 1
420+
metadata:
421+
filterMetadata:
422+
envoy-gateway:
423+
resources:
424+
- kind: Gateway
425+
name: eg
426+
namespace: envoy-gateway-system
427+
sectionName: http
420428
name: 0.0.0.0-10080
421429
perConnectionBufferLimitBytes: 32768
422430
- '@type': type.googleapis.com/envoy.admin.v3.RoutesConfigDump

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,5 +163,13 @@ xds:
163163
useRemoteAddress: true
164164
name: envoy-gateway-system/eg/http
165165
maxConnectionsToAcceptPerSocketEvent: 1
166+
metadata:
167+
filterMetadata:
168+
envoy-gateway:
169+
resources:
170+
- kind: Gateway
171+
name: eg
172+
namespace: envoy-gateway-system
173+
sectionName: http
166174
name: 0.0.0.0-10080
167175
perConnectionBufferLimitBytes: 32768

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,14 @@ xds:
352352
useRemoteAddress: true
353353
name: envoy-gateway-system/eg/http
354354
maxConnectionsToAcceptPerSocketEvent: 1
355+
metadata:
356+
filterMetadata:
357+
envoy-gateway:
358+
resources:
359+
- kind: Gateway
360+
name: eg
361+
namespace: envoy-gateway-system
362+
sectionName: http
355363
name: 0.0.0.0-10080
356364
perConnectionBufferLimitBytes: 32768
357365
- '@type': type.googleapis.com/envoy.admin.v3.RoutesConfigDump

internal/xds/translator/testdata/in/xds-ir/jsonpatch-add-op-without-value.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ envoyPatchPolicies:
1010
namespace: "default"
1111
jsonPatches:
1212
- type: "type.googleapis.com/envoy.config.listener.v3.Listener"
13-
name: "first-listener"
13+
name: "::-10080"
1414
operation:
1515
op: "add"
1616
path: "/filter_chains/0/filters/0/typed_config/http_filters/0"

internal/xds/translator/testdata/in/xds-ir/jsonpatch-invalid-listener.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
jsonPatches:
22
- type: "type.googleapis.com/envoy.config.listener.v3.Listener"
3-
name: "first-listener"
3+
name: "0.0.0.0-10080"
44
operation:
55
op: "add"
66
path: "/default_filter_chain/filters/0/typed_config/http_filters/0"

0 commit comments

Comments
 (0)