xds/bootstrap: refactor to support top level and per-authority server config #4892
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
Author
|
This PR has the same changes from #4867, but also a commit to remove support for the new fields.
The new fields will be added when the other components are updated to use the new fields. Before that's ready, users specifying new fields will get logging about unknown fields. |
menghanl
force-pushed
the
federation_bootstrap_refactor
branch
from
e897ed3 to
8a715fc
Compare
…ration Support new bootstrap fields - client_default_listener_resource_name_template - authorities Changes - new struct for server config (URI, creds, v2/v3, node), and reused for top level and per-authority server - and fix all the usages - node proto message is now for each server, to be consistent with TransportAPI version - config test to use cmp.Diff
…ers will see logging. Will add back after xdsclient and others are updated to make use of this new fields.
menghanl
force-pushed
the
federation_bootstrap_refactor
branch
from
8a715fc to
3cf068b
Compare
easwars
approved these changes
Nov 1, 2021
| return nil, fmt.Errorf("xds: json.Unmarshal(%v) for field %q failed during bootstrap: %v", string(v), k, err) | ||
| } | ||
| default: | ||
| logger.Infof("Bootstrap content has unknown field: %s", k) |
Contributor
There was a problem hiding this comment.
Should this be at warning level?
Contributor
Author
There was a problem hiding this comment.
Changed. I think it's lower than warning.
| return nil | ||
| } | ||
|
|
||
| // Authority represents an Authority for an xDS control plane server. |
Contributor
There was a problem hiding this comment.
Can we have a comment which is more helpful than this :)
Contributor
Author
There was a problem hiding this comment.
I cannot think of useful comment for this struct. It's usage is explained in the Config struct where it's used.
I added a sentence.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes
RELEASE NOTES: N/A