NET-6385 - Static routes that are inlined in listener filters are also created as a resource.

agent/xds/clusters_test.go

@@ -90,7 +90,7 @@ func makeClusterDiscoChainTests(enterprise bool) []clusterTestCase {
 				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "failover", enterprise, nil, nil)
 			},
 			// TODO(proxystate): requires routes work
-			alsoRunTestForV2: false,
+			alsoRunTestForV2: true,
 		},
 		{
 			name: "connect-proxy-with-tcp-chain-failover-through-remote-gateway",

agent/xds/endpoints_test.go

@@ -247,20 +247,6 @@ type endpointTestCase struct {
 
 func makeEndpointDiscoChainTests(enterprise bool) []endpointTestCase {
 	return []endpointTestCase{
-		{
-			name: "connect-proxy-with-chain-and-overrides",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "simple-with-overrides", enterprise, nil, nil)
-			},
-			alsoRunTestForV2: true,
-		},
-		{
-			name: "connect-proxy-with-chain-and-failover",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "failover", enterprise, nil, nil)
-			},
-			alsoRunTestForV2: true,
-		},
 		{
 			name: "connect-proxy-with-tcp-chain-failover-through-remote-gateway",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {

agent/xds/proxystateconverter/clusters.go

@@ -864,6 +864,7 @@ func (s *Converter) makeUpstreamClustersForDiscoveryChain(
 			failoverGroup = &pbproxystate.FailoverGroup{
 				Config: &pbproxystate.FailoverGroupConfig{
 					ConnectTimeout: durationpb.New(node.Resolver.ConnectTimeout),
+					UseAltStatName: true,
 				},
 			}
 		}
@@ -927,6 +928,7 @@ func (s *Converter) makeUpstreamClustersForDiscoveryChain(
 					Group: &pbproxystate.EndpointGroup_Dynamic{
 						Dynamic: dynamic,
 					},
+					Name: groupedTarget.ClusterName,
 				}
 				endpointGroups = append(endpointGroups, eg)
 			} else {
@@ -940,6 +942,7 @@ func (s *Converter) makeUpstreamClustersForDiscoveryChain(
 							},
 						},
 					},
+					Name: mappedTargets.baseClusterName,
 				}
 
 				out[mappedTargets.baseClusterName] = cluster

agent/xds/proxystateconverter/failover_policy.go

@@ -124,22 +124,6 @@ func (s *Converter) mapDiscoChainTargets(cfgSnap *proxycfg.ConfigSnapshot, chain
 				Service:    target.Service,
 			}.URI().String()}
 		}
-		//commonTLSContext := makeCommonTLSContext(
-		//	cfgSnap.Leaf(),
-		//	rootPEMs,
-		//	makeTLSParametersFromProxyTLSConfig(cfgSnap.MeshConfigTLSOutgoing()),
-		//)
-		//
-		//err := injectSANMatcher(commonTLSContext, spiffeIDs...)
-		//if err != nil {
-		//	return failoverTargets, fmt.Errorf("failed to inject SAN matcher rules for cluster %q: %v", sni, err)
-		//}
-
-		//tlsContext := &envoy_tls_v3.UpstreamTlsContext{
-		//	CommonTlsContext: commonTLSContext,
-		//	Sni:              sni,
-		//}
-		//ti.TLSContext = tlsContext
 		failoverTargets.targets = append(failoverTargets.targets, ti)
 	}