Carry 24492: Remove swarm inspect and use info instead #25042
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
tiborvass
added
status/2-code-review
process/cherry-pick
and removed
status/0-triage
labels
2 tasks
Signed-off-by: Tibor Vass <tibor@docker.com>
Remove the swarm inspect command and use docker info instead to display swarm information if the current node is a manager. Signed-off-by: Vincent Demeester <vincent@sbr.pm>
|
LGTM, but docker info output is becoming quite large, for readability we may want to consider introducing subcommand to info later on (e,g |
| fmt.Fprintf(dockerCli.Out(), " Managers: %d\n", info.Swarm.Managers) | ||
| fmt.Fprintf(dockerCli.Out(), " Nodes: %d\n", info.Swarm.Nodes) | ||
| fmt.Fprintf(dockerCli.Out(), " Name: %s\n", info.Swarm.Cluster.Spec.Annotations.Name) | ||
| fmt.Fprintf(dockerCli.Out(), " Orchestration:\n") | ||
| fmt.Fprintf(dockerCli.Out(), " Task History Retention: %d\n", info.Swarm.Cluster.Spec.Orchestration.TaskHistoryRetentionLimit) |
There was a problem hiding this comment.
either "Task History Retention Limit: %d" or "Task History Retention: %d tasks"
|
Some minor suggestions, otherwise LGTM. |
|
LGTM |
|
LGTM, I agree with @aaronlehmann's suggestions |
|
@aaronlehmann fixed |
|
Merge away when CI is ready. |
Signed-off-by: Tibor Vass <tibor@docker.com>
|
Win2lin has issues, it's unrelated |
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.
Carrying #24492
Vendored docker/engine-api#334
Closes #24492
Closes #24148