update for some upstream patch #388
Merged
Conversation
This file contains 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
* Use clientv3.NewCtxClient instead of New to avoid automatic retry of all RPCs * Only timeout status requests; allow defrag and alarm clear requests to run to completion. * Only clear alarms on the local cluster member, not ALL cluster members Signed-off-by: Brad Davidson <[email protected]> (cherry picked from commit 095e34d) Signed-off-by: Brad Davidson <[email protected]> porting by Signed-off-by: Deshi Xiao <[email protected]>
Signed-off-by: Brad Davidson <[email protected]> (cherry picked from commit a39e191) Signed-off-by: Brad Davidson <[email protected]> porting by Signed-off-by: Deshi Xiao <[email protected]>
Signed-off-by: Brad Davidson <[email protected]> (cherry picked from commit bc60ff7) Signed-off-by: Brad Davidson <[email protected]> porting by Signed-off-by: Deshi Xiao <[email protected]>
Add new flag that is passed through to the device_ownership_from_security_context parameter in the containerd CRI config. This is not possible to change without providing a complete custom containerd.toml template so we should add a flag for it. Signed-off-by: Brad Davidson <[email protected]> (cherry picked from commit 56fb3b0) Signed-off-by: Brad Davidson <[email protected]> porting by Signed-off-by: Deshi Xiao <[email protected]>
External CLI actions cannot short-circuit on --help or --version, so we cannot skip loading the config file if these flags are present when running these wrapped commands. The behavior of just returning the override flag name instead of the requested flag value was breaking data-dir lookup when running wrapped commands. Signed-off-by: Brad Davidson <[email protected]> (cherry picked from commit ff5c633) Signed-off-by: Brad Davidson <[email protected]> porting by Signed-off-by: Deshi Xiao <[email protected]>
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.