Fix transport certificates reconciliation #2740
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
Commit 174e09b introduced a regression by using the generic secret reconciler when we first create the transport certs secret. This secret reconciliation is rather special, since it ensures the secret exists (before Pods are created), but does not care about its data (since we don't have Pods IPs yet). If an existing secret has some data already, we must make sure we don't clear it. Which is what the generic reconciler would do. This commit basically restores the code as it existed before the refactoring in 174e09b, and adds a unit test to catch the regression.
sebgl
commented
Mar 20, 2020
| @@ -120,7 +122,7 @@ func ReconcileTransportCertificatesSecrets( | |||
| func ensureTransportCertificatesSecretExists( | |||
| c k8s.Client, | |||
| es esv1.Elasticsearch, | |||
| ) (corev1.Secret, error) { | |||
| ) (*corev1.Secret, error) { | |||
There was a problem hiding this comment.
I'm not very fond of returning pointers when not required (it introduces doubt: should we check for nil?), but for the sake of "just fixing the regression" I re-introduced the code as it was before 174e09b.
sebgl
commented
Mar 20, 2020
| @@ -104,7 +106,7 @@ func ReconcileTransportCertificatesSecrets( | |||
| } | |||
|
|
|||
| if !reflect.DeepEqual(secret, currentTransportCertificatesSecret) { | |||
| if err := c.Update(&secret); err != nil { | |||
| if err := c.Update(secret); err != nil { | |||
There was a problem hiding this comment.
I think this is the place where we could potentially benefit from the generic secret reconciler, but it requires a bit more work. I'll open a follow-up issue.
|
Jenkins test this please |
barkbay
approved these changes
Mar 20, 2020
|
Jenkins test this please |
This was referenced Mar 20, 2020
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.
Commit 174e09b introduced a regression
by using the generic secret reconciler when we first create the
transport certs secret.
This secret reconciliation is rather special, since it ensures the
secret exists (before Pods are created), but does not care about its
data (since we don't have Pods IPs yet).
If an existing secret has some data already, we must make sure we don't
clear it. Which is what the generic reconciler would do.
This commit basically restores the code as it existed before the
refactoring in 174e09b, and adds a unit
test to catch the regression.