diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/destinations.go b/internal/mesh/internal/controllers/sidecarproxy/builder/destinations.go index 6031d72cfd96..ac6015a73835 100644 --- a/internal/mesh/internal/controllers/sidecarproxy/builder/destinations.go +++ b/internal/mesh/internal/controllers/sidecarproxy/builder/destinations.go @@ -290,7 +290,6 @@ func (b *Builder) buildDestination( clusterName := fmt.Sprintf("%s.%s", portName, sni) egName := "" - if details.FailoverConfig != nil { egName = fmt.Sprintf("%s%d~%s", xdscommon.FailoverClusterNamePrefix, 0, clusterName) } diff --git a/internal/mesh/internal/controllers/xds/controller_test.go b/internal/mesh/internal/controllers/xds/controller_test.go index 8476b87c8c50..ae5535e35589 100644 --- a/internal/mesh/internal/controllers/xds/controller_test.go +++ b/internal/mesh/internal/controllers/xds/controller_test.go @@ -1012,8 +1012,7 @@ func (suite *xdsControllerTestSuite) TestReconcile_SidecarProxyGoldenFileInputs( "destination/l4-multi-destination", "destination/l4-multiple-implicit-destinations-tproxy", "destination/l4-implicit-and-explicit-destinations-tproxy", - // TODO(jm): resolve the endpoint group naming issue - //"destination/mixed-multi-destination", + "destination/mixed-multi-destination", "destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy", "destination/multiport-l4-and-l7-single-implicit-destination-tproxy", "destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy", diff --git a/internal/mesh/internal/controllers/xds/testdata/destination/mixed-multi-destination.golden b/internal/mesh/internal/controllers/xds/testdata/destination/mixed-multi-destination.golden index 7c5cab23d23a..3c227e99dae4 100644 --- a/internal/mesh/internal/controllers/xds/testdata/destination/mixed-multi-destination.golden +++ b/internal/mesh/internal/controllers/xds/testdata/destination/mixed-multi-destination.golden @@ -29,7 +29,8 @@ } } } - } + }, + "name": "failover-target~0~http.api-1.default.dc1.internal.foo.consul" }, { "dynamic": { @@ -53,7 +54,7 @@ } } }, - "name": "failover-target~0~http.api-1.default.dc1.internal.foo.consul" + "name": "failover-target~1~http.api-1.default.dc1.internal.foo.consul" } ] }, @@ -330,7 +331,7 @@ } ] }, - "tcp2.api-1.default.dc1.internal.foo.consul": { + "http.api-1.default.dc1.internal.foo.consul": { "endpoints": [ { "healthStatus": "HEALTH_STATUS_HEALTHY", @@ -341,7 +342,7 @@ } ] }, - "tcp2.api-2.default.dc1.internal.foo.consul": { + "http.api-2.default.dc1.internal.foo.consul": { "endpoints": [ { "healthStatus": "HEALTH_STATUS_HEALTHY",