Skip to content

xds/bootstrap: refactor to support top level and per-authority server config #4892

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
menghanl merged 9 commits into from
Nov 2, 2021
Merged

xds/bootstrap: refactor to support top level and per-authority server config #4892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
25a49a9
[federation_bootstrap] xds/bootstrap: support new fields for xds fede…
menghanl Oct 12, 2021
2c34b06
[federation_bootstrap] c1
menghanl Oct 15, 2021
392ac36
[federation_bootstrap] c2
menghanl Oct 15, 2021
b164194
[federation_bootstrap] examples in tests???
menghanl Oct 15, 2021
39e6ba6
[federation_bootstrap] out from godoc
menghanl Oct 15, 2021
d8033ea
[federation_bootstrap] add Infof for unknown bootstrap fields
menghanl Oct 20, 2021
cab7f4f
[federation_bootstrap_refactor] Remove new fields support, so that us…
menghanl Oct 20, 2021
3cf068b
[federation_bootstrap_refactor] fix vet comments
menghanl Oct 20, 2021
3261735
[federation_bootstrap_refactor] c
menghanl Nov 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion xds/csds/csds.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ func (s *ClientStatusDiscoveryServer) buildClientStatusRespForReq(req *v3statusp
ret := &v3statuspb.ClientStatusResponse{
Config: []*v3statuspb.ClientConfig{
{
Node: nodeProtoToV3(s.xdsClient.BootstrapConfig().NodeProto),
Node: nodeProtoToV3(s.xdsClient.BootstrapConfig().XDSServer.NodeProto),
GenericXdsConfigs: configs,
},
},
Expand Down
10 changes: 6 additions & 4 deletions xds/googledirectpath/googlec2p.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,12 @@ func (c2pResolverBuilder) Build(t resolver.Target, cc resolver.ClientConn, opts
balancerName = tdURL
}
config := &bootstrap.Config{
BalancerName: balancerName,
Creds: grpc.WithCredentialsBundle(google.NewDefaultCredentials()),
TransportAPI: version.TransportV3,
NodeProto: newNode(<-zoneCh, <-ipv6CapableCh),
XDSServer: &bootstrap.ServerConfig{
ServerURI: balancerName,
Creds: grpc.WithCredentialsBundle(google.NewDefaultCredentials()),
TransportAPI: version.TransportV3,
NodeProto: newNode(<-zoneCh, <-ipv6CapableCh),
},
}

// Create singleton xds client with this config. The xds client will be
Expand Down
13 changes: 8 additions & 5 deletions xds/googledirectpath/googlec2p_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,15 +211,18 @@ func TestBuildXDS(t *testing.T) {
}
}
wantConfig := &bootstrap.Config{
BalancerName: tdURL,
TransportAPI: version.TransportV3,
NodeProto: wantNode,
XDSServer: &bootstrap.ServerConfig{
ServerURI: tdURL,
TransportAPI: version.TransportV3,
NodeProto: wantNode,
},
}
if tt.tdURI != "" {
wantConfig.BalancerName = tt.tdURI
wantConfig.XDSServer.ServerURI = tt.tdURI
}
cmpOpts := cmp.Options{
cmpopts.IgnoreFields(bootstrap.Config{}, "Creds"),
cmpopts.IgnoreFields(bootstrap.ServerConfig{}, "Creds"),
cmp.AllowUnexported(bootstrap.ServerConfig{}),
protocmp.Transform(),
}
select {
Expand Down
Loading