xds: make fallback bootstrap configuration per-process #7401
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
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #7401 +/- ##
==========================================
- Coverage 81.47% 81.31% -0.16%
==========================================
Files 348 348
Lines 26741 26752 +11
==========================================
- Hits 21786 21753 -33
- Misses 3772 3795 +23
- Partials 1183 1204 +21
|
dfawley
approved these changes
Jul 10, 2024
internal/xds/bootstrap/bootstrap.go
Outdated
| return nil | ||
| } | ||
|
|
||
| // UnSetFallbackBootstrapConfigForTesting unsets the fallback bootstrap |
internal/xds/bootstrap/bootstrap.go
Outdated
| // getFallbackBootstrapConfig returns the fallback bootstrap configuration | ||
| // that will be used by the xDS client when the bootstrap environment | ||
| // variables are unset. | ||
| func getFallbackBootstrapConfig() *Config { |
Contributor
Author
There was a problem hiding this comment.
Done. Had to also rename the var to make this possible,
printchard
pushed a commit
to printchard/grpc-go
that referenced
this pull request
Jul 11, 2024
printchard
pushed a commit
to printchard/grpc-go
that referenced
this pull request
Jul 30, 2024
printchard
pushed a commit
to printchard/grpc-go
that referenced
this pull request
Jul 30, 2024
16 tasks
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.
This PR makes fallback bootstrap configuration to be a per-process configuration. This means that it applies to all xDS clients created by the process when the bootstrap environment variables are unset. This switches us to the model used in C-core.
Summary of changes:
internal/xds/bootstrapNewConfigwithGetConfiguration. The latter retrieves bootstrap configuration from the ordered list of sources.NewConfigForTestingto create bootstrap configuration for testing purposes.ConfigOptionsForTestingstruct, replaced theNodeIDfield with aNodefield that supports node information specified as JSON. This fixes an earlier shortsightedness.xds/googledirectpathmap[string]json.RawMessagefollowed by a call tojson.Marshalinstead of creating it as a[]byte.xds/internal/xdsclientxdsclient.Newandxdsclient.NewForTesting#a71-xds-fallback
Fixes #7346
RELEASE NOTES: none