xds: use Cluster_AUTO DnsLookupFamily (envoyproxy#4740)

* xds: use Cluster_AUTO DnsLookupFamily Signed-off-by: zirain <zirain2009@gmail.com> * nit Signed-off-by: zirain <zirain2009@gmail.com> * gen Signed-off-by: zirain <zirain2009@gmail.com> --------- Signed-off-by: zirain <zirain2009@gmail.com>
guydc · Nov 20, 2024 · a924cec · a924cec
1 parent 86d750a
commit a924cec
Show file tree

Hide file tree

Showing 141 changed files with 10 additions and 336 deletions.
diff --git a/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml b/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml
@@ -772,7 +772,6 @@ xds:
           commonLbConfig:
             localityWeightedLbConfig: {}
           connectTimeout: 10s
-          dnsLookupFamily: V4_ONLY
           edsClusterConfig:
             edsConfig:
               ads: {}
@@ -792,7 +791,6 @@ xds:
           commonLbConfig:
             localityWeightedLbConfig: {}
           connectTimeout: 10s
-          dnsLookupFamily: V4_ONLY
           edsClusterConfig:
             edsConfig:
               ads: {}
@@ -819,7 +817,6 @@ xds:
           commonLbConfig:
             localityWeightedLbConfig: {}
           connectTimeout: 10s
-          dnsLookupFamily: V4_ONLY
           edsClusterConfig:
             edsConfig:
               ads: {}
@@ -839,7 +836,6 @@ xds:
           commonLbConfig:
             localityWeightedLbConfig: {}
           connectTimeout: 10s
-          dnsLookupFamily: V4_ONLY
           edsClusterConfig:
             edsConfig:
               ads: {}
@@ -859,7 +855,6 @@ xds:
           commonLbConfig:
             localityWeightedLbConfig: {}
           connectTimeout: 10s
-          dnsLookupFamily: V4_ONLY
           edsClusterConfig:
             edsConfig:
               ads: {}

diff --git a/internal/cmd/egctl/testdata/translate/out/echo-gateway-api.cluster.yaml b/internal/cmd/egctl/testdata/translate/out/echo-gateway-api.cluster.yaml
@@ -100,7 +100,6 @@ xds:
         commonLbConfig:
           localityWeightedLbConfig: {}
         connectTimeout: 10s
-        dnsLookupFamily: V4_ONLY
         edsClusterConfig:
           edsConfig:
             ads: {}

diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json
@@ -458,7 +458,6 @@
                   "localityWeightedLbConfig": {}
                 },
                 "connectTimeout": "10s",
-                "dnsLookupFamily": "V4_ONLY",
                 "edsClusterConfig": {
                   "edsConfig": {
                     "ads": {},
@@ -488,7 +487,6 @@
                   "localityWeightedLbConfig": {}
                 },
                 "connectTimeout": "10s",
-                "dnsLookupFamily": "V4_ONLY",
                 "edsClusterConfig": {
                   "edsConfig": {
                     "ads": {},
@@ -529,7 +527,6 @@
                   "localityWeightedLbConfig": {}
                 },
                 "connectTimeout": "10s",
-                "dnsLookupFamily": "V4_ONLY",
                 "edsClusterConfig": {
                   "edsConfig": {
                     "ads": {},
@@ -559,7 +556,6 @@
                   "localityWeightedLbConfig": {}
                 },
                 "connectTimeout": "10s",
-                "dnsLookupFamily": "V4_ONLY",
                 "edsClusterConfig": {
                   "edsConfig": {
                     "ads": {},
@@ -589,7 +585,6 @@
                   "localityWeightedLbConfig": {}
                 },
                 "connectTimeout": "10s",
-                "dnsLookupFamily": "V4_ONLY",
                 "edsClusterConfig": {
                   "edsConfig": {
                     "ads": {},

diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml
@@ -251,7 +251,6 @@ xds:
           commonLbConfig:
             localityWeightedLbConfig: {}
           connectTimeout: 10s
-          dnsLookupFamily: V4_ONLY
           edsClusterConfig:
             edsConfig:
               ads: {}
@@ -271,7 +270,6 @@ xds:
           commonLbConfig:
             localityWeightedLbConfig: {}
           connectTimeout: 10s
-          dnsLookupFamily: V4_ONLY
           edsClusterConfig:
             edsConfig:
               ads: {}
@@ -298,7 +296,6 @@ xds:
           commonLbConfig:
             localityWeightedLbConfig: {}
           connectTimeout: 10s
-          dnsLookupFamily: V4_ONLY
           edsClusterConfig:
             edsConfig:
               ads: {}
@@ -318,7 +315,6 @@ xds:
           commonLbConfig:
             localityWeightedLbConfig: {}
           connectTimeout: 10s
-          dnsLookupFamily: V4_ONLY
           edsClusterConfig:
             edsConfig:
               ads: {}
@@ -338,7 +334,6 @@ xds:
           commonLbConfig:
             localityWeightedLbConfig: {}
           connectTimeout: 10s
-          dnsLookupFamily: V4_ONLY
           edsClusterConfig:
             edsConfig:
               ads: {}

diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.cluster.yaml b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.cluster.yaml
@@ -10,7 +10,6 @@ xds:
         commonLbConfig:
           localityWeightedLbConfig: {}
         connectTimeout: 10s
-        dnsLookupFamily: V4_ONLY
         edsClusterConfig:
           edsConfig:
             ads: {}
@@ -30,7 +29,6 @@ xds:
         commonLbConfig:
           localityWeightedLbConfig: {}
         connectTimeout: 10s
-        dnsLookupFamily: V4_ONLY
         edsClusterConfig:
           edsConfig:
             ads: {}
@@ -57,7 +55,6 @@ xds:
         commonLbConfig:
           localityWeightedLbConfig: {}
         connectTimeout: 10s
-        dnsLookupFamily: V4_ONLY
         edsClusterConfig:
           edsConfig:
             ads: {}
@@ -77,7 +74,6 @@ xds:
         commonLbConfig:
           localityWeightedLbConfig: {}
         connectTimeout: 10s
-        dnsLookupFamily: V4_ONLY
         edsClusterConfig:
           edsConfig:
             ads: {}
@@ -97,7 +93,6 @@ xds:
         commonLbConfig:
           localityWeightedLbConfig: {}
         connectTimeout: 10s
-        dnsLookupFamily: V4_ONLY
         edsClusterConfig:
           edsConfig:
             ads: {}

diff --git a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.json b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.json
@@ -350,7 +350,6 @@
                   "localityWeightedLbConfig": {}
                 },
                 "connectTimeout": "10s",
-                "dnsLookupFamily": "V4_ONLY",
                 "edsClusterConfig": {
                   "edsConfig": {
                     "ads": {},
@@ -380,7 +379,6 @@
                   "localityWeightedLbConfig": {}
                 },
                 "connectTimeout": "10s",
-                "dnsLookupFamily": "V4_ONLY",
                 "dnsRefreshRate": "30s",
                 "lbPolicy": "LEAST_REQUEST",
                 "loadAssignment": {

diff --git a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.yaml b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.yaml
@@ -195,7 +195,6 @@ xds:
           commonLbConfig:
             localityWeightedLbConfig: {}
           connectTimeout: 10s
-          dnsLookupFamily: V4_ONLY
           edsClusterConfig:
             edsConfig:
               ads: {}
@@ -215,7 +214,6 @@ xds:
           commonLbConfig:
             localityWeightedLbConfig: {}
           connectTimeout: 10s
-          dnsLookupFamily: V4_ONLY
           dnsRefreshRate: 30s
           lbPolicy: LEAST_REQUEST
           loadAssignment:

diff --git a/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.cluster.yaml b/internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.cluster.yaml
@@ -10,7 +10,6 @@ xds:
         commonLbConfig:
           localityWeightedLbConfig: {}
         connectTimeout: 10s
-        dnsLookupFamily: V4_ONLY
         edsClusterConfig:
           edsConfig:
             ads: {}
@@ -30,7 +29,6 @@ xds:
         commonLbConfig:
           localityWeightedLbConfig: {}
         connectTimeout: 10s
-        dnsLookupFamily: V4_ONLY
         dnsRefreshRate: 30s
         lbPolicy: LEAST_REQUEST
         loadAssignment:

diff --git a/internal/cmd/egctl/testdata/translate/out/no-service-cluster-ip.all.yaml b/internal/cmd/egctl/testdata/translate/out/no-service-cluster-ip.all.yaml
@@ -195,7 +195,6 @@ xds:
           commonLbConfig:
             localityWeightedLbConfig: {}
           connectTimeout: 10s
-          dnsLookupFamily: V4_ONLY
           edsClusterConfig:
             edsConfig:
               ads: {}

diff --git a/internal/xds/translator/cluster.go b/internal/xds/translator/cluster.go
@@ -84,9 +84,16 @@ func buildEndpointType(settings []*ir.DestinationSetting) EndpointType {
 }
 
 func buildXdsCluster(args *xdsClusterArgs) *clusterv3.Cluster {
-	dnsLookupFamily := clusterv3.Cluster_V4_ONLY
-	if args.ipFamily != nil && *args.ipFamily == egv1a1.DualStack {
-		dnsLookupFamily = clusterv3.Cluster_ALL
+	dnsLookupFamily := clusterv3.Cluster_AUTO
+	if args.ipFamily != nil {
+		switch *args.ipFamily {
+		case egv1a1.IPv4:
+			dnsLookupFamily = clusterv3.Cluster_V4_ONLY
+		case egv1a1.IPv6:
+			dnsLookupFamily = clusterv3.Cluster_V6_ONLY
+		case egv1a1.DualStack:
+			dnsLookupFamily = clusterv3.Cluster_ALL
+		}
 	}
 	cluster := &clusterv3.Cluster{
 		Name:            args.name,

diff --git a/...l/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.clusters.yaml b/...l/xds/translator/testdata/out/extension-xds-ir/extensionpolicy-tcp-udp-http.clusters.yaml
@@ -4,7 +4,6 @@
   commonLbConfig:
     localityWeightedLbConfig: {}
   connectTimeout: 10s
-  dnsLookupFamily: V4_ONLY
   edsClusterConfig:
     edsConfig:
       ads: {}
@@ -22,7 +21,6 @@
   commonLbConfig:
     localityWeightedLbConfig: {}
   connectTimeout: 10s
-  dnsLookupFamily: V4_ONLY
   edsClusterConfig:
     edsConfig:
       ads: {}
@@ -40,7 +38,6 @@
   commonLbConfig:
     localityWeightedLbConfig: {}
   connectTimeout: 10s
-  dnsLookupFamily: V4_ONLY
   edsClusterConfig:
     edsConfig:
       ads: {}

diff --git a/...al/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.clusters.yaml b/...al/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.clusters.yaml
@@ -4,7 +4,6 @@
   commonLbConfig:
     localityWeightedLbConfig: {}
   connectTimeout: 10s
-  dnsLookupFamily: V4_ONLY
   edsClusterConfig:
     edsConfig:
       ads: {}

diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route.clusters.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route.clusters.yaml
@@ -4,7 +4,6 @@
   commonLbConfig:
     localityWeightedLbConfig: {}
   connectTimeout: 10s
-  dnsLookupFamily: V4_ONLY
   edsClusterConfig:
     edsConfig:
       ads: {}

diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-als-tcp.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-als-tcp.clusters.yaml
@@ -5,7 +5,6 @@
   commonLbConfig:
     localityWeightedLbConfig: {}
   connectTimeout: 15s
-  dnsLookupFamily: V4_ONLY
   edsClusterConfig:
     edsConfig:
       ads: {}

diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-cel.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-cel.clusters.yaml
@@ -4,7 +4,6 @@
   commonLbConfig:
     localityWeightedLbConfig: {}
   connectTimeout: 10s
-  dnsLookupFamily: V4_ONLY
   edsClusterConfig:
     edsConfig:
       ads: {}
@@ -22,7 +21,6 @@
   commonLbConfig:
     localityWeightedLbConfig: {}
   connectTimeout: 10s
-  dnsLookupFamily: V4_ONLY
   dnsRefreshRate: 30s
   lbPolicy: LEAST_REQUEST
   loadAssignment:

diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-endpoint-stats.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-endpoint-stats.clusters.yaml
@@ -4,7 +4,6 @@
   commonLbConfig:
     localityWeightedLbConfig: {}
   connectTimeout: 10s
-  dnsLookupFamily: V4_ONLY
   edsClusterConfig:
     edsConfig:
       ads: {}
@@ -24,7 +23,6 @@
   commonLbConfig:
     localityWeightedLbConfig: {}
   connectTimeout: 10s
-  dnsLookupFamily: V4_ONLY
   dnsRefreshRate: 30s
   lbPolicy: LEAST_REQUEST
   loadAssignment:

diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-formatters.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-formatters.clusters.yaml
@@ -4,7 +4,6 @@
   commonLbConfig:
     localityWeightedLbConfig: {}
   connectTimeout: 10s
-  dnsLookupFamily: V4_ONLY
   edsClusterConfig:
     edsConfig:
       ads: {}
@@ -22,7 +21,6 @@
   commonLbConfig:
     localityWeightedLbConfig: {}
   connectTimeout: 10s
-  dnsLookupFamily: V4_ONLY
   dnsRefreshRate: 30s
   lbPolicy: LEAST_REQUEST
   loadAssignment:

diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog-multi-cel.clusters.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog-multi-cel.clusters.yaml
@@ -4,7 +4,6 @@
   commonLbConfig:
     localityWeightedLbConfig: {}
   connectTimeout: 10s
-  dnsLookupFamily: V4_ONLY
   edsClusterConfig:
     edsConfig:
       ads: {}
@@ -22,7 +21,6 @@
   commonLbConfig:
     localityWeightedLbConfig: {}
   connectTimeout: 10s
-  dnsLookupFamily: V4_ONLY
   dnsRefreshRate: 30s
   lbPolicy: LEAST_REQUEST
   loadAssignment: