Skip to content

Commit 996aabe

Browse files
authored
xds: migrate internal xdsclient to use generic client and dedicated LRS client (#8310)
1 parent ec91b2e commit 996aabe

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+1376
-7393
lines changed

internal/xds/bootstrap/bootstrap.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,10 +217,16 @@ func (sc *ServerConfig) ServerFeaturesIgnoreResourceDeletion() bool {
217217
return false
218218
}
219219

220+
// SelectedCreds returns the selected credentials configuration for
221+
// communicating with this server.
222+
func (sc *ServerConfig) SelectedCreds() ChannelCreds {
223+
return sc.selectedCreds
224+
}
225+
220226
// DialOptions returns a slice of all the configured dial options for this
221-
// server.
227+
// server except grpc.WithCredentialsBundle().
222228
func (sc *ServerConfig) DialOptions() []grpc.DialOption {
223-
dopts := []grpc.DialOption{sc.credsDialOption}
229+
var dopts []grpc.DialOption
224230
if sc.extraDialOptions != nil {
225231
dopts = append(dopts, sc.extraDialOptions...)
226232
}

0 commit comments

Comments
 (0)