Skip to content

Commit 276fd20

Browse files
zhaohuabingzirainarkodg
authored
[release/v1.2] Cherry pick IPv6 support to v1.2.3 (#4819)
* xds: use IPv4Compat on ready server (#4798) Signed-off-by: zirain <[email protected]> (cherry picked from commit 9f9de74) Signed-off-by: Huabing Zhao <[email protected]> * xds: use `::1` if IPFamily is IPv6 on admin server (#4801) xds: use if IPFamily is IPv6 Signed-off-by: zirain <[email protected]> (cherry picked from commit 17e932c) Signed-off-by: Huabing Zhao <[email protected]> * listen on ipv4 addresses by default (#4817) * listen on `::` if the listener IPFamily is `IPv6` or `DualStack` * Set `ipv4_compat` to `true` if `IPFamily` is `DualStack` Signed-off-by: Arko Dasgupta <[email protected]> (cherry picked from commit d1a8c47) Signed-off-by: Huabing Zhao <[email protected]> --------- Signed-off-by: zirain <[email protected]> Signed-off-by: Huabing Zhao <[email protected]> Signed-off-by: Arko Dasgupta <[email protected]> Co-authored-by: zirain <[email protected]> Co-authored-by: Arko Dasgupta <[email protected]>
1 parent 2493f6a commit 276fd20

File tree

511 files changed

+1567
-741
lines changed

Some content is hidden

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

511 files changed

+1567
-741
lines changed

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

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ envoyProxyForGatewayClass:
4343
- name: envoy-gateway-proxy-ready-0.0.0.0-19001
4444
address:
4545
socket_address:
46-
address: 0.0.0.0
46+
address: '0.0.0.0'
4747
port_value: 19001
4848
protocol: TCP
4949
filter_chains:
@@ -891,8 +891,7 @@ xds:
891891
path: /dev/stdout
892892
address:
893893
socketAddress:
894-
address: '::'
895-
ipv4Compat: true
894+
address: 0.0.0.0
896895
portValue: 10080
897896
defaultFilterChain:
898897
filters:
@@ -951,8 +950,7 @@ xds:
951950
path: /dev/stdout
952951
address:
953952
socketAddress:
954-
address: '::'
955-
ipv4Compat: true
953+
address: 0.0.0.0
956954
portValue: 8080
957955
defaultFilterChain:
958956
filters:
@@ -1019,8 +1017,7 @@ xds:
10191017
path: /dev/stdout
10201018
address:
10211019
socketAddress:
1022-
address: '::'
1023-
ipv4Compat: true
1020+
address: 0.0.0.0
10241021
portValue: 1234
10251022
filterChains:
10261023
- filters:
@@ -1059,8 +1056,7 @@ xds:
10591056
path: /dev/stdout
10601057
address:
10611058
socketAddress:
1062-
address: '::'
1063-
ipv4Compat: true
1059+
address: 0.0.0.0
10641060
portValue: 8443
10651061
filterChains:
10661062
- filterChainMatch:
@@ -1106,8 +1102,7 @@ xds:
11061102
path: /dev/stdout
11071103
address:
11081104
socketAddress:
1109-
address: '::'
1110-
ipv4Compat: true
1105+
address: 0.0.0.0
11111106
portValue: 1234
11121107
protocol: UDP
11131108
listenerFilters:

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

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -637,8 +637,7 @@
637637
],
638638
"address": {
639639
"socketAddress": {
640-
"address": "::",
641-
"ipv4Compat": true,
640+
"address": "0.0.0.0",
642641
"portValue": 10080
643642
}
644643
},
@@ -729,8 +728,7 @@
729728
],
730729
"address": {
731730
"socketAddress": {
732-
"address": "::",
733-
"ipv4Compat": true,
731+
"address": "0.0.0.0",
734732
"portValue": 8080
735733
}
736734
},
@@ -835,8 +833,7 @@
835833
],
836834
"address": {
837835
"socketAddress": {
838-
"address": "::",
839-
"ipv4Compat": true,
836+
"address": "0.0.0.0",
840837
"portValue": 1234
841838
}
842839
},
@@ -901,8 +898,7 @@
901898
],
902899
"address": {
903900
"socketAddress": {
904-
"address": "::",
905-
"ipv4Compat": true,
901+
"address": "0.0.0.0",
906902
"portValue": 8443
907903
}
908904
},
@@ -980,8 +976,7 @@
980976
],
981977
"address": {
982978
"socketAddress": {
983-
"address": "::",
984-
"ipv4Compat": true,
979+
"address": "0.0.0.0",
985980
"portValue": 1234,
986981
"protocol": "UDP"
987982
}

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

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -370,8 +370,7 @@ xds:
370370
path: /dev/stdout
371371
address:
372372
socketAddress:
373-
address: '::'
374-
ipv4Compat: true
373+
address: 0.0.0.0
375374
portValue: 10080
376375
defaultFilterChain:
377376
filters:
@@ -430,8 +429,7 @@ xds:
430429
path: /dev/stdout
431430
address:
432431
socketAddress:
433-
address: '::'
434-
ipv4Compat: true
432+
address: 0.0.0.0
435433
portValue: 8080
436434
defaultFilterChain:
437435
filters:
@@ -498,8 +496,7 @@ xds:
498496
path: /dev/stdout
499497
address:
500498
socketAddress:
501-
address: '::'
502-
ipv4Compat: true
499+
address: 0.0.0.0
503500
portValue: 1234
504501
filterChains:
505502
- filters:
@@ -538,8 +535,7 @@ xds:
538535
path: /dev/stdout
539536
address:
540537
socketAddress:
541-
address: '::'
542-
ipv4Compat: true
538+
address: 0.0.0.0
543539
portValue: 8443
544540
filterChains:
545541
- filterChainMatch:
@@ -585,8 +581,7 @@ xds:
585581
path: /dev/stdout
586582
address:
587583
socketAddress:
588-
address: '::'
589-
ipv4Compat: true
584+
address: 0.0.0.0
590585
portValue: 1234
591586
protocol: UDP
592587
listenerFilters:

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

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ xds:
2020
path: /dev/stdout
2121
address:
2222
socketAddress:
23-
address: '::'
24-
ipv4Compat: true
23+
address: 0.0.0.0
2524
portValue: 10080
2625
defaultFilterChain:
2726
filters:
@@ -80,8 +79,7 @@ xds:
8079
path: /dev/stdout
8180
address:
8281
socketAddress:
83-
address: '::'
84-
ipv4Compat: true
82+
address: 0.0.0.0
8583
portValue: 8080
8684
defaultFilterChain:
8785
filters:
@@ -148,8 +146,7 @@ xds:
148146
path: /dev/stdout
149147
address:
150148
socketAddress:
151-
address: '::'
152-
ipv4Compat: true
149+
address: 0.0.0.0
153150
portValue: 1234
154151
filterChains:
155152
- filters:
@@ -188,8 +185,7 @@ xds:
188185
path: /dev/stdout
189186
address:
190187
socketAddress:
191-
address: '::'
192-
ipv4Compat: true
188+
address: 0.0.0.0
193189
portValue: 8443
194190
filterChains:
195191
- filterChainMatch:
@@ -235,8 +231,7 @@ xds:
235231
path: /dev/stdout
236232
address:
237233
socketAddress:
238-
address: '::'
239-
ipv4Compat: true
234+
address: 0.0.0.0
240235
portValue: 1234
241236
protocol: UDP
242237
listenerFilters:

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -460,8 +460,7 @@
460460
],
461461
"address": {
462462
"socketAddress": {
463-
"address": "::",
464-
"ipv4Compat": true,
463+
"address": "0.0.0.0",
465464
"portValue": 10080
466465
}
467466
},

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,8 +265,7 @@ xds:
265265
path: /dev/stdout
266266
address:
267267
socketAddress:
268-
address: '::'
269-
ipv4Compat: true
268+
address: 0.0.0.0
270269
portValue: 10080
271270
defaultFilterChain:
272271
filters:

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ xds:
2020
path: /dev/stdout
2121
address:
2222
socketAddress:
23-
address: '::'
24-
ipv4Compat: true
23+
address: 0.0.0.0
2524
portValue: 10080
2625
defaultFilterChain:
2726
filters:

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,8 +227,7 @@ xds:
227227
path: /dev/stdout
228228
address:
229229
socketAddress:
230-
address: '::'
231-
ipv4Compat: true
230+
address: 0.0.0.0
232231
portValue: 10080
233232
defaultFilterChain:
234233
filters:

‎internal/cmd/egctl/testdata/translate/out/quickstart.all.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ xdsIR:
9595
text:
9696
- path: /dev/stdout
9797
http:
98-
- address: '::'
98+
- address: 0.0.0.0
9999
hostnames:
100100
- '*'
101101
isHTTP2: false

‎internal/gatewayapi/helpers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,7 @@ func getIPFamily(envoyProxy *egv1a1.EnvoyProxy) *ir.IPFamily {
621621
case egv1a1.IPv6:
622622
result = ir.IPv6
623623
case egv1a1.DualStack:
624-
result = ir.Dualstack
624+
result = ir.DualStack
625625
default:
626626
return nil
627627
}

0 commit comments

Comments
 (0)