backport of commit bf691461a0 (#15152)

This pull request was automerged via backport-assistant

agent/xds/clusters.go

@@ -629,9 +629,15 @@ func (s *ResourceGenerator) makeGatewayOutgoingClusterPeeringServiceClusters(cfg
 			// usual mesh gateway route for a service.
 			clusterName := node.Service.Connect.PeerMeta.PrimarySNI()
 
+			var hostnameEndpoints structs.CheckServiceNodes
+			if serviceGroup.UseCDS {
+				hostnameEndpoints = serviceGroup.Nodes
+			}
+
 			opts := clusterOpts{
 				name:              clusterName,
 				isRemote:          true,
+				hostnameEndpoints: hostnameEndpoints,
 			}
 			cluster := s.makeGatewayCluster(cfgSnap, opts)
 

agent/xds/testdata/clusters/mesh-gateway-with-imported-peered-services.latest.golden

@@ -5,14 +5,6 @@
       "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
       "name": "alt.default.default.peer-b.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",
       "type": "LOGICAL_DNS",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {
-
-          },
-          "resourceApiVersion": "V3"
-        }
-      },
       "connectTimeout": "5s",
       "loadAssignment": {
         "clusterName": "alt.default.default.peer-b.external.1c053652-8512-4373-90cf-5a7f6263a994.consul",