Skip to content
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.

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

xds: Move bootstrap config to internal/xds #7182

Merged
merged 2 commits into from
May 3, 2024

Conversation

zasweq
Copy link
Contributor

@zasweq zasweq commented May 3, 2024

This PR moves bootstrap config to internal/xds. This allows CSM Plugin Option to call bootstrap config parsing to parse the out the mesh id from the node proto's id.

In the future, we could perhaps make the bootstrap config a singleton (and wrap creation function with something like a sync.OnceFunc).

RELEASE NOTES: N/A

@zasweq zasweq requested a review from dfawley May 3, 2024 00:08
@zasweq zasweq added the Type: Internal Cleanup Refactors, etc label May 3, 2024
@zasweq zasweq added this to the 1.64 Release milestone May 3, 2024
@zasweq zasweq force-pushed the move-bootstrap-config branch from 1c6c080 to 28c1e4e Compare May 3, 2024 00:11
@zasweq zasweq force-pushed the move-bootstrap-config branch from 28c1e4e to 6db3560 Compare May 3, 2024 00:19
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is fine...

But do you think maybe this logic (and this file) would be even better in grpc/xds/bootstrap? (And then blank import that package from this package's bootstrap.go?

I'm OK either way, but would lean toward moving it in with the registry if you can't think of any reason it's better off (or needs to be?) here. These are essentially "default supported creds", and if it's possible for a user to import the registry but not get these creds in it, that seems weird.

Copy link
Contributor Author

@zasweq zasweq May 3, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm fine with either. I'll move it, since it does ref that exported bootstrap package anyway.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need to blank import, the package is already imported :).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh yeah, it does Gets

@zasweq zasweq merged commit 9199290 into grpc:master May 3, 2024
12 checks passed
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Oct 31, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants