Skip to content

Commit

Permalink
Revert "xds/googlec2p: use xdstp names for LDS (#6949)" (#6964)
Browse files Browse the repository at this point in the history
  • Loading branch information
apolcyn authored Feb 5, 2024
1 parent 03e76b3 commit 05b4a8b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
3 changes: 1 addition & 2 deletions xds/googledirectpath/googlec2p.go
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
3 changes: 1 addition & 2 deletions xds/googledirectpath/googlec2p_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 05b4a8b

Please sign in to comment.