Output external CAs in swarm mode with docker info
#25204
Merged
+6
−0
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
|
LGTM Setting milestone to 1.12.1 since the relevant issue is on the 1.12.1 milestone. ping @dhiltgen |
|
LGTM |
|
ah @yongtang, needs a rebase 😅 |
This fix tries to address the issue raised in 25195 where external CA configurations are not present in `docker info`. This fix adds the output of external CAs in `docker info` in swarm mode. The test is done manually with: ``` docker run -p 8888:8888 -e CXFSSL_ADDRESS=0.0.0.0 -d fabric8/cfssl docker swarm init --external-ca protocol=cfssl,url=http://172.17.0.2:8888 ``` The `docker info` output: ``` Managers: 1 Nodes: 1 Orchestration: Task History Retention Limit: 5 Raft: Snapshot interval: 10000 Heartbeat tick: 1 Election tick: 3 Dispatcher: Heartbeat period: 5 seconds CA configuration: Expiry duration: 3 months External CAs: cfssl: https://172.17.0.2:8888 ``` This fix fixes 25195. Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
yongtang
force-pushed
the
25195-docker-info-ca-configuration
branch
from
1da502a to
995128e
Compare
|
Thanks @vdemeester rebased. |
|
The build failure is related to "no space left": |
|
LGTM |
Merged
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.
- What I did
This fix tries to address the issue raised in #25195 where external CA configurations are not present in
docker info.- How I did it
This fix adds the output of external CAs in
docker infoin swarm mode.- How to verify it
The test is done manually with:
The
docker infooutput:- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)
This fix fixes #25195.
Signed-off-by: Yong Tang yong.tang.github@outlook.com