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

[ca] When rotating the root CA, ignore the node membership #2218

Merged

Conversation

cyli
Copy link
Contributor

@cyli cyli commented Jun 6, 2017

When rotating the root CA, tell nodes that are in "pending" membership status
to rotate as well, because the membership status isn't really used atm, and it
is valid for a node update to change the membership status to pending by
accident.

Also attempt to stabilize some of the root rotation tests. (I think this fixes #2138)

cc @aaronlehmann @diogomonica

moby/moby does not set the NodeSpec.Membership, so whenever there's a node update, the membership status gets set to PENDING which is the default value.

@cyli cyli force-pushed the root-rotation-also-waits-for-pending-nodes branch from b2cf0f7 to 1d6f6d2 Compare June 6, 2017 00:42
@cyli cyli added this to the 17.06 milestone Jun 6, 2017
…p status

to rotate as well, because the membership status isn't really used atm, and it
is valid for a node update to change the membership status to pending by
accident.

Also attempt to stabilize some of the root rotation tests.

Signed-off-by: Ying Li <ying.li@docker.com>
@cyli cyli force-pushed the root-rotation-also-waits-for-pending-nodes branch from 1d6f6d2 to aaea568 Compare June 6, 2017 00:52
@codecov
Copy link

codecov bot commented Jun 6, 2017

Codecov Report

Merging #2218 into master will decrease coverage by 0.2%.
The diff coverage is 100%.

@@            Coverage Diff             @@
##           master    #2218      +/-   ##
==========================================
- Coverage    60.4%   60.19%   -0.21%     
==========================================
  Files         124      124              
  Lines       20149    20149              
==========================================
- Hits        12171    12129      -42     
- Misses       6620     6659      +39     
- Partials     1358     1361       +3

@cyli cyli mentioned this pull request Jun 6, 2017
23 tasks
@aaronlehmann
Copy link
Collaborator

LGTM

@andrewhsu andrewhsu mentioned this pull request Jun 6, 2017
40 tasks
@diogomonica diogomonica merged commit e426eed into moby:master Jun 7, 2017
@cyli cyli deleted the root-rotation-also-waits-for-pending-nodes branch June 7, 2017 23:09
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Feb 3, 2020
silvin-lubecki pushed a commit to silvin-lubecki/engine-extract that referenced this pull request Feb 3, 2020
silvin-lubecki pushed a commit to silvin-lubecki/engine-extract that referenced this pull request Mar 10, 2020
silvin-lubecki pushed a commit to silvin-lubecki/engine-extract that referenced this pull request Mar 23, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Flaky test: TestRootRotationReconciliationNoChanges
3 participants