K8SPG-555: fix updating CA secrets to 2.5.0 #906
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
pooknull
requested review from
hors,
egegunes and
inelpandzic
as code owners
egegunes
reviewed
Sep 25, 2024
Comment on lines
+348
to
+361
| if cr.CompareVersion("2.5.0") < 0 { | ||
| if k8serrors.IsNotFound(err) { | ||
| // K8SPG-555: We should create an empty secret with old name, so that crunchy part can populate it | ||
| // instead of creating secrets unique to the cluster | ||
| // TODO: remove when 2.4.0 will become unsupported | ||
| if err := r.Client.Create(ctx, oldCASecret); err != nil { | ||
| return errors.Wrap(err, "failed to create ca secret") | ||
| } | ||
| } | ||
| return nil | ||
| } | ||
| if k8serrors.IsNotFound(err) { | ||
| return nil | ||
| } |
There was a problem hiding this comment.
can we merge these two conditions:
Suggested change
| if cr.CompareVersion("2.5.0") < 0 { | |
| if k8serrors.IsNotFound(err) { | |
| // K8SPG-555: We should create an empty secret with old name, so that crunchy part can populate it | |
| // instead of creating secrets unique to the cluster | |
| // TODO: remove when 2.4.0 will become unsupported | |
| if err := r.Client.Create(ctx, oldCASecret); err != nil { | |
| return errors.Wrap(err, "failed to create ca secret") | |
| } | |
| } | |
| return nil | |
| } | |
| if k8serrors.IsNotFound(err) { | |
| return nil | |
| } | |
| if k8serrors.IsNotFound(err) { | |
| if cr.CompareVersion("2.5.0") < 0 { | |
| // K8SPG-555: We should create an empty secret with old name, so that crunchy part can populate it | |
| // instead of creating secrets unique to the cluster | |
| // TODO: remove when 2.4.0 will become unsupported | |
| if err := r.Client.Create(ctx, oldCASecret); err != nil { | |
| return errors.Wrap(err, "failed to create ca secret") | |
| } | |
| } | |
| return nil | |
| } |
There was a problem hiding this comment.
We can't merge it, because we have to return if the version is lower than 2.5.0, even if secret was found.
| // We should copy the contents of the old CA secret, if it exists, to the new one, which is unique for each cluster. | ||
| // TODO: remove when 2.4.0 will become unsupported | ||
| newCASecret := &corev1.Secret{ | ||
| ObjectMeta: naming.PostgresRootCASecret(&v1beta1.PostgresCluster{ObjectMeta: metav1.ObjectMeta{Name: cr.Name, Namespace: cr.Namespace}}), |
There was a problem hiding this comment.
can we break this into multiple lines?
egegunes
previously approved these changes
Sep 25, 2024
inelpandzic
previously approved these changes
Sep 25, 2024
commit: 75f148f |
egegunes
approved these changes
Sep 27, 2024
nmarukovich
approved these changes
Sep 27, 2024
hors
approved these changes
Sep 27, 2024
jvpasinatto
pushed a commit
that referenced
this pull request
Sep 27, 2024
* K8SPG-555: fix updating CA secrets to 2.5.0 https://perconadev.atlassian.net/browse/K8SPG-555 * fix * add validation for custom certificates * improve validation * break into multiple lines * fix * small fix --------- Co-authored-by: Viacheslav Sarzhan <[email protected]>
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.
https://perconadev.atlassian.net/browse/K8SPG-555
DESCRIPTION
This PR fixes a problem introduced by #876.
Problem:
During the update to 2.5.0, the operator creates a new CA.
Solution:
Operator should create a copy of an old CA secret, if it exists, with a new name unique to a cluster.
This PR also adds validation for the following fields:
.spec.customRootCATLSSecret.spec.customTLSSecret.spec.customReplicationTLSSecretIt's necessary, because crunchy code silently creates new certificates if wrong values were set.
CHECKLIST
Jira
Needs Doc) and QA (Needs QA)?Tests
Config/Logging/Testability