Revert "xds/googlec2p: use xdstp names for LDS (grpc#6949)"

This reverts commit 3aafa84.
apolcyn · Feb 5, 2024 · f802b97 · f802b97
1 parent 03e76b3
commit f802b97
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/xds/googledirectpath/googlec2p.go b/xds/googledirectpath/googlec2p.go
@@ -120,8 +120,7 @@ func (c2pResolverBuilder) Build(t resolver.Target, cc resolver.ClientConn, opts
 		ClientDefaultListenerResourceNameTemplate: "%s",
 		Authorities: map[string]*bootstrap.Authority{
 			c2pAuthority: {
-				XDSServer:                          serverConfig,
-				ClientListenerResourceNameTemplate: "xdstp://traffic-director-c2p.xds.googleapis.com/envoy.config.listener.v3.Listener/%s",
+				XDSServer: serverConfig,
 			},
 		},
 		NodeProto: newNode(<-zoneCh, <-ipv6CapableCh),

diff --git a/xds/googledirectpath/googlec2p_test.go b/xds/googledirectpath/googlec2p_test.go
@@ -223,8 +223,7 @@ func TestBuildXDS(t *testing.T) {
 				ClientDefaultListenerResourceNameTemplate: "%s",
 				Authorities: map[string]*bootstrap.Authority{
 					"traffic-director-c2p.xds.googleapis.com": {
-						XDSServer:                          wantServerConfig,
-						ClientListenerResourceNameTemplate: "xdstp://traffic-director-c2p.xds.googleapis.com/envoy.config.listener.v3.Listener/%s",
+						XDSServer: wantServerConfig,
 					},
 				},
 				NodeProto: wantNode,