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

Handle an edge case in CA rotation where we reclaim CA service from an external CA #2681

Merged
merged 1 commit into from
Oct 11, 2018

Conversation

cyli
Copy link
Contributor

@cyli cyli commented Jul 2, 2018

Support the edge case for CA rotation where the current root CA has an external CA URL but not key, and the swarm update adds the same cert and key and removes
the external CA URL. Previously this would error, because it first made sure that the external CA URLs needed by the old root CA were present. This now succeeds because no root rotation is needed, a key is just being provided where none was present before.

This also adds several additional CA root rotation test cases to validate the case where there was an external CA URL, but the root CA also has a key (the external URL is preferred), and the swarm update for removes the external URL without changing the certificate and key.

This should make it easier to reclaim CA functionality from an external CA if the swarm already has the CA cert and key.

cc @BillMills

…A has an

external CA URL, but the root CA also has a key (the external URL is preferred),
and the swarm update for removes the external URL without changing the certificate
and key.  This should succeed.

Support the edge case for CA rotation where the current root CA has an external
CA URL but not key, and the swarm update adds the same cert and key and removes
the external CA URL.  Previously this would error, because it first made sure
that the external CA URLs needed by the old root CA were present, but this now
succeeds because no root rotation is needed, a key is just being provided where
none was present before.

Signed-off-by: Ying Li <[email protected]>
@thaJeztah
Copy link
Member

ping @justincormack @dperny @anshulpundir PTAL

@dperny
Copy link
Collaborator

dperny commented Oct 10, 2018

LGTM, I think.

@thaJeztah
Copy link
Member

@anshulpundir good to go? (not a maintainer; no permissions to merge 😅)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants