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

[17.06] backport (cli) If `docker swarm ca` is not called with the `--rotate` flag, warn if other flags are passed #110

Merged
merged 2 commits into from Jul 13, 2017

Conversation

Projects
None yet
3 participants
@andrewhsu
Collaborator

andrewhsu commented Jul 11, 2017

Backport fix (each PR has just one git commit):

  • docker/cli/pull/207 If docker swarm ca is not called with the --rotate flag, warn if other flags are passed
  • docker/cli/pull/328 Fix warning in docker CLI when swarm ca is called with flags other than --rotate

With cherry-pick of docker/cli@32b43bc and docker/cli@4615c92:

$ git cherry-pick -s -x -Xsubtree=components/cli 32b43bc 4615c92

Conflict with components/cli/cli/command/swarm/ca_test.go in that the docker/cli@4615c92 cherry-pick wanted to modify it and it did not exist on the 17.06 branch. Resolved the conflict by not apply the diff to that file.

If `docker swarm ca` is not called with the `--rotate` flag, the other
flags, including cert expiry, will be ignored, so warn if a user attempts
to use `docker swarm ca --cert-expiry` or something.

Signed-off-by: Ying Li <ying.li@docker.com>
(cherry picked from commit 32b43bc21a053cbe566feefd3c54def739d40bfe)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
@andrewhsu

This comment has been minimized.

Show comment
Hide comment
@andrewhsu

andrewhsu Jul 12, 2017

Collaborator

@cyli when you get the chance can you have a look at this backport?

Collaborator

andrewhsu commented Jul 12, 2017

@cyli when you get the chance can you have a look at this backport?

@andrewhsu andrewhsu modified the milestone: 17.06.1 Jul 12, 2017

@cyli

This comment has been minimized.

Show comment
Hide comment
@cyli

cyli Jul 12, 2017

Contributor

@andrewhsu That definitely matches the change in the docker/cli#207, however I noticed a comment indicating a bug in that partiuclar fix, so have openned docker/cli#328.

The only change is to change that second flagCACert to flagCertExpiry. I'm not sure how to cherry-pick that change, since there was a refactor between docker/cli#207, and docker/cli#328.

Contributor

cyli commented Jul 12, 2017

@andrewhsu That definitely matches the change in the docker/cli#207, however I noticed a comment indicating a bug in that partiuclar fix, so have openned docker/cli#328.

The only change is to change that second flagCACert to flagCertExpiry. I'm not sure how to cherry-pick that change, since there was a refactor between docker/cli#207, and docker/cli#328.

@thaJeztah

This comment has been minimized.

Show comment
Hide comment
@thaJeztah

thaJeztah Jul 12, 2017

Member

I just merged docker/cli#328 - if it doesn't apply cleanly, perhaps just add a second commit to the PR to perform the fix

Member

thaJeztah commented Jul 12, 2017

I just merged docker/cli#328 - if it doesn't apply cleanly, perhaps just add a second commit to the PR to perform the fix

Fix warning in docker CLI when `swarm ca --ca-cert`, etc. flags are p…
…assed,

and add a test.

Signed-off-by: Ying Li <ying.li@docker.com>
(cherry picked from commit 4615c92f661b724ece58937ccfecbb24f602fc32)

Conflicts:
components/cli/cli/command/swarm/ca_test.go
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
@andrewhsu

This comment has been minimized.

Show comment
Hide comment
@andrewhsu

andrewhsu Jul 13, 2017

Collaborator

I brought in the commit from docker/cli#328:

$ git cherry-pick -s -x -Xsubtree=components/cli 4615c92f

Conflict with components/cli/cli/command/swarm/ca_test.go in that the docker/cli@4615c92 cherry-pick wanted to modify it and it did not exist on the 17.06 branch. Resolved the conflict by not apply the diff to that file.

Collaborator

andrewhsu commented Jul 13, 2017

I brought in the commit from docker/cli#328:

$ git cherry-pick -s -x -Xsubtree=components/cli 4615c92f

Conflict with components/cli/cli/command/swarm/ca_test.go in that the docker/cli@4615c92 cherry-pick wanted to modify it and it did not exist on the 17.06 branch. Resolved the conflict by not apply the diff to that file.

@cyli

This comment has been minimized.

Show comment
Hide comment
@cyli

cyli Jul 13, 2017

Contributor

LGTM on green, thanks @andrewhsu and @thaJeztah!

Contributor

cyli commented Jul 13, 2017

LGTM on green, thanks @andrewhsu and @thaJeztah!

@thaJeztah

LGTM

@andrewhsu andrewhsu merged commit 9795a15 into docker:17.06 Jul 13, 2017

3 checks passed

ce-tests Jenkins build docker-ce-17.06-pr 177 has succeeded
Details
ce-tests-WoW-RS1 Jenkins build docker-ce-17.06-pr-WoW-RS1 171 has succeeded
Details
dco-signed All commits are signed

@andrewhsu andrewhsu deleted the andrewhsu:fix-swarm-warn branch Jul 13, 2017

docker-jenkins pushed a commit that referenced this pull request May 23, 2018

Merge pull request #110 from thaJeztah/remove-pigz-on-centos
Remove pigz requirement for CentOS
Upstream-commit: 4d5e0466854e97ef3a1b6716bc0c09790d3503ec
Component: packaging
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment