Skip to content

Commit 4ffccf1

Browse files
authored
googlec2p: use xdstp style template for client LDS resource name (#7048)
1 parent faf9964 commit 4ffccf1

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

xds/googledirectpath/googlec2p.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ func (c2pResolverBuilder) Build(t resolver.Target, cc resolver.ClientConn, opts
110110
{
111111
"server_uri": "%s",
112112
"channel_creds": [{"type": "google_default"}],
113-
"server_features": ["xds_v3", "ignore_resource_deletion"]
113+
"server_features": ["xds_v3", "ignore_resource_deletion", "xds.config.resource-in-sotw"]
114114
}`, balancerName)))
115115
if err != nil {
116116
return nil, fmt.Errorf("failed to build bootstrap configuration: %v", err)
@@ -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: fmt.Sprintf("xdstp://%s/envoy.config.listener.v3.Listener/%%s", c2pAuthority),
124125
},
125126
},
126127
NodeProto: newNode(<-zoneCh, <-ipv6CapableCh),

xds/googledirectpath/googlec2p_test.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ func TestBuildXDS(t *testing.T) {
213213
wantServerConfig, err := bootstrap.ServerConfigFromJSON([]byte(fmt.Sprintf(`{
214214
"server_uri": "%s",
215215
"channel_creds": [{"type": "google_default"}],
216-
"server_features": ["xds_v3", "ignore_resource_deletion"]
216+
"server_features": ["xds_v3", "ignore_resource_deletion", "xds.config.resource-in-sotw"]
217217
}`, tdURL)))
218218
if err != nil {
219219
t.Fatalf("Failed to build server bootstrap config: %v", err)
@@ -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)