Clean up ssl package and fix dynamic cert mode #3886
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
k8s-ci-robot
added
do-not-merge/work-in-progress
k8s-ci-robot
added
size/L
k8s-ci-robot
removed
the
do-not-merge/work-in-progress
ElvinEfendi
changed the title
|
/lgtm |
k8s-ci-robot
added
the
lgtm
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: aledbf, ElvinEfendi The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
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 this PR does / why we need it:
The PR first cleans up ssl package by
splitting
AddOrUpdateCertAndKeyinto three functions where first we createSSLCertobject after validating cert and key (CreateSSLCert) and second function where we storeSSLCerton disk (StoreSSLCertOnDisk), and third function where we append CA certificate and updateSSLCertobject's relevant fields (ConfigureCACertWithCertAndKey). This let's us get rid ofCreateSSLCert's old implementation that was only for Dynamic SSL mode.similarly split
AddCertAuthintoCreateCACertandConfigureCACert. This was not necessary but is good to keep things consistent and be able to further DRY the ssl package by potentially mergingCreateCACertwithCreateSSLCertand by mergingConfigureCACertwithConfigureCACertWithCertAndKey.With these refactoring it becomes more obvious that when secret includes tls, cert as well as ca.crt we don't store the bundled certificate in dynamic SSL mode. We should make sure it's stored on disk in dynamic SSL mode so that TLS client authentication works as expected in this mode.
Which issue this PR fixes (optional, in
fixes #<issue number>(, fixes #<issue_number>, ...)format, will close that issue when PR gets merged): fixes #Special notes for your reviewer:
5667ea5 is the comment that actually fixes the bug, everything else is refactoring.