From 9ba66f1b84200242519fc5f25fc5175809ddba4f Mon Sep 17 00:00:00 2001 From: Easwar Swaminathan Date: Tue, 12 Jul 2022 11:37:52 -0700 Subject: [PATCH] xdsclient: use top-level server list if authority specific list is empty (#5491) --- xds/internal/xdsclient/authority.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xds/internal/xdsclient/authority.go b/xds/internal/xdsclient/authority.go index 26db726dd..4c0ad2832 100644 --- a/xds/internal/xdsclient/authority.go +++ b/xds/internal/xdsclient/authority.go @@ -54,7 +54,9 @@ func (c *clientImpl) findAuthority(n *xdsresource.Name) (_ *authority, unref fun if !ok { return nil, nil, fmt.Errorf("xds: failed to find authority %q", authority) } - config = cfg.XDSServer + if cfg.XDSServer != nil { + config = cfg.XDSServer + } } a, err := c.newAuthorityLocked(config)