Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

xds: use V4_PREFERRED dnsLookupFamily by default #4745

Merged
merged 2 commits into from
Nov 26, 2024
+335 −1
Merged

xds: use V4_PREFERRED dnsLookupFamily by default #4745

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94d8535
use Cluster_V4_PREFERRED
zirain Nov 20, 2024
1dfd21e
release notes
zirain Nov 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml
View file
Original file line number Diff line number Diff line change
@@ -772,6 +772,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -791,6 +792,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -817,6 +819,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -836,6 +839,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -855,6 +859,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
1 change: 1 addition & 0 deletions internal/cmd/egctl/testdata/translate/out/echo-gateway-api.cluster.yaml
View file
Original file line number Diff line number Diff line change
@@ -100,6 +100,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
5 changes: 5 additions & 0 deletions internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json
View file
Original file line number Diff line number Diff line change
@@ -458,6 +458,7 @@
"localityWeightedLbConfig": {}
},
"connectTimeout": "10s",
"dnsLookupFamily": "V4_PREFERRED",
"edsClusterConfig": {
"edsConfig": {
"ads": {},
@@ -487,6 +488,7 @@
"localityWeightedLbConfig": {}
},
"connectTimeout": "10s",
"dnsLookupFamily": "V4_PREFERRED",
"edsClusterConfig": {
"edsConfig": {
"ads": {},
@@ -527,6 +529,7 @@
"localityWeightedLbConfig": {}
},
"connectTimeout": "10s",
"dnsLookupFamily": "V4_PREFERRED",
"edsClusterConfig": {
"edsConfig": {
"ads": {},
@@ -556,6 +559,7 @@
"localityWeightedLbConfig": {}
},
"connectTimeout": "10s",
"dnsLookupFamily": "V4_PREFERRED",
"edsClusterConfig": {
"edsConfig": {
"ads": {},
@@ -585,6 +589,7 @@
"localityWeightedLbConfig": {}
},
"connectTimeout": "10s",
"dnsLookupFamily": "V4_PREFERRED",
"edsClusterConfig": {
"edsConfig": {
"ads": {},
5 changes: 5 additions & 0 deletions internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml
View file
Original file line number Diff line number Diff line change
@@ -251,6 +251,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -270,6 +271,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -296,6 +298,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -315,6 +318,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -334,6 +338,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
5 changes: 5 additions & 0 deletions internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.cluster.yaml
View file
Original file line number Diff line number Diff line change
@@ -10,6 +10,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -29,6 +30,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -55,6 +57,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -74,6 +77,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -93,6 +97,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
2 changes: 2 additions & 0 deletions internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.json
View file
Original file line number Diff line number Diff line change
@@ -350,6 +350,7 @@
"localityWeightedLbConfig": {}
},
"connectTimeout": "10s",
"dnsLookupFamily": "V4_PREFERRED",
"edsClusterConfig": {
"edsConfig": {
"ads": {},
@@ -379,6 +380,7 @@
"localityWeightedLbConfig": {}
},
"connectTimeout": "10s",
"dnsLookupFamily": "V4_PREFERRED",
"dnsRefreshRate": "30s",
"lbPolicy": "LEAST_REQUEST",
"loadAssignment": {
2 changes: 2 additions & 0 deletions internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.yaml
View file
Original file line number Diff line number Diff line change
@@ -195,6 +195,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -214,6 +215,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
lbPolicy: LEAST_REQUEST
loadAssignment:
2 changes: 2 additions & 0 deletions internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.cluster.yaml
View file
Original file line number Diff line number Diff line change
@@ -10,6 +10,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -29,6 +30,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
lbPolicy: LEAST_REQUEST
loadAssignment:
1 change: 1 addition & 0 deletions internal/cmd/egctl/testdata/translate/out/no-service-cluster-ip.all.yaml
View file
Original file line number Diff line number Diff line change
@@ -195,6 +195,7 @@ xds:
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
2 changes: 1 addition & 1 deletion internal/xds/translator/cluster.go
View file
Original file line number Diff line number Diff line change
@@ -84,7 +84,7 @@ func buildEndpointType(settings []*ir.DestinationSetting) EndpointType {
}

func buildXdsCluster(args *xdsClusterArgs) *clusterv3.Cluster {
dnsLookupFamily := clusterv3.Cluster_AUTO
dnsLookupFamily := clusterv3.Cluster_V4_PREFERRED
if args.ipFamily != nil {
switch *args.ipFamily {
case egv1a1.IPv4:
3 changes: 3 additions & 0 deletions ...l/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.clusters.yaml
View file
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -38,6 +40,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
1 change: 1 addition & 0 deletions ...al/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.clusters.yaml
View file
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
1 change: 1 addition & 0 deletions internal/xds/translator/testdata/out/extension-xds-ir/http-route.clusters.yaml
View file
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
1 change: 1 addition & 0 deletions internal/xds/translator/testdata/out/xds-ir/accesslog-als-tcp.clusters.yaml
View file
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 15s
dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
2 changes: 2 additions & 0 deletions internal/xds/translator/testdata/out/xds-ir/accesslog-cel.clusters.yaml
View file
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
lbPolicy: LEAST_REQUEST
loadAssignment:
2 changes: 2 additions & 0 deletions internal/xds/translator/testdata/out/xds-ir/accesslog-endpoint-stats.clusters.yaml
View file
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -23,6 +24,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
lbPolicy: LEAST_REQUEST
loadAssignment:
2 changes: 2 additions & 0 deletions internal/xds/translator/testdata/out/xds-ir/accesslog-formatters.clusters.yaml
View file
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
lbPolicy: LEAST_REQUEST
loadAssignment:
2 changes: 2 additions & 0 deletions internal/xds/translator/testdata/out/xds-ir/accesslog-multi-cel.clusters.yaml
View file
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
edsClusterConfig:
edsConfig:
ads: {}
@@ -21,6 +22,7 @@
commonLbConfig:
localityWeightedLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
lbPolicy: LEAST_REQUEST
loadAssignment:
Loading

Unchanged files with check annotations Beta

View file
examples/standalone/quickstart.yaml
spec:
endpoints:
- ip:
address: 0.0.0.0 # this address is for demo purpose only, do not use it in production!

Check warning on line 45 in examples/standalone/quickstart.yaml

GitHub Actions / lint 

45:26 [comments] too few spaces before comment

Check warning on line 45 in examples/standalone/quickstart.yaml

GitHub Actions / lint 

45:26 [comments] too few spaces before comment
port: 3000