Skip to content

Commit 3aafa84

Browse files
authored
xds/googlec2p: use xdstp names for LDS (#6949)
1 parent 02858ee commit 3aafa84

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

xds/googledirectpath/googlec2p.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,8 @@ func (c2pResolverBuilder) Build(t resolver.Target, cc resolver.ClientConn, opts
120120
ClientDefaultListenerResourceNameTemplate: "%s",
121121
Authorities: map[string]*bootstrap.Authority{
122122
c2pAuthority: {
123-
XDSServer: serverConfig,
123+
XDSServer: serverConfig,
124+
ClientListenerResourceNameTemplate: "xdstp://traffic-director-c2p.xds.googleapis.com/envoy.config.listener.v3.Listener/%s",
124125
},
125126
},
126127
NodeProto: newNode(<-zoneCh, <-ipv6CapableCh),

xds/googledirectpath/googlec2p_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,8 @@ func TestBuildXDS(t *testing.T) {
223223
ClientDefaultListenerResourceNameTemplate: "%s",
224224
Authorities: map[string]*bootstrap.Authority{
225225
"traffic-director-c2p.xds.googleapis.com": {
226-
XDSServer: wantServerConfig,
226+
XDSServer: wantServerConfig,
227+
ClientListenerResourceNameTemplate: "xdstp://traffic-director-c2p.xds.googleapis.com/envoy.config.listener.v3.Listener/%s",
227228
},
228229
},
229230
NodeProto: wantNode,

0 commit comments

Comments
 (0)