K8SPG-994: allow multi-cert pem bundles in CustomRootCATLSSecret - #1680
Merged
Conversation
Signed-off-by: Mayank Shah <mayank.shah@percona.com>
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates the operator’s PKI certificate (un)marshaling so that a customRootCATLSSecret containing a multi-certificate PEM bundle (e.g., intermediate + root) is preserved and propagated into per-instance trust stores (e.g., patroni.ca-roots), avoiding TLS verification failures during bootstrap.
Changes:
- Extend
pki.Certificateto retain and re-emit additional PEM certificates found after the first certificate in a bundle. - Update
Certificate.MarshalText/UnmarshalTextto round-trip multi-cert bundles while ignoring non-certificate PEM blocks. - Add/extend unit tests, including a Patroni reconciliation test that asserts the CA bundle is preserved.
Reviewed changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| internal/pki/pki.go | Adds a chain field to Certificate to store additional cert PEM blocks from bundles. |
| internal/pki/encoding.go | Implements bundle-preserving marshal/unmarshal logic for certificates (keeps extra certs, ignores non-cert blocks). |
| internal/pki/encoding_test.go | Adds coverage for bundle round-trip and ignoring non-certificate PEM blocks (one assertion needs adjustment). |
| internal/patroni/reconcile_test.go | Adds a reconciliation test ensuring patroni.ca-roots contains the full CA bundle. |
Comment on lines
61
to
+64
| var sink Certificate | ||
| assert.NilError(t, sink.UnmarshalText(bundle)) | ||
| assert.DeepEqual(t, cert, sink) | ||
|
|
mayankshah1607
marked this pull request as ready for review
July 14, 2026 07:53
mayankshah1607
requested review from
egegunes,
gkech,
hors,
nmarukovich,
oksana-grishchenko and
pooknull
as code owners
July 14, 2026 07:53
egegunes
approved these changes
Jul 14, 2026
oksana-grishchenko
approved these changes
Jul 14, 2026
Comment on lines
+71
to
+80
| for { | ||
| var next *pem.Block | ||
| next, rest = pem.Decode(rest) | ||
| if next == nil { | ||
| break | ||
| } | ||
| if next.Type == pemLabelCertificate { | ||
| c.chain = append(c.chain, pem.EncodeToMemory(next)...) | ||
| } | ||
| } |
Contributor
There was a problem hiding this comment.
Just wondering if we should set a reasonable limit for the number of certs. This loop can potentially go wild if for some reason (intentionally or not) the chain is too long
Member
Author
There was a problem hiding this comment.
I'm not sure what the limit should be, do you have a number in mind?
nmarukovich
approved these changes
Jul 16, 2026
Collaborator
commit: e7170fc |
This file contains hidden or 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
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.
CHANGE DESCRIPTION
Problem:
When
customRootCATLSSecretprovides aroot.crtcontaining multiple PEM-encoded certificates (intermediate CA + root CA), the operator copies only the first PEM block into per-instancepatroni.ca-rootsand the pgBackRest trust store. This breaks TLS verification for any deployment using intermediate CAs and prevents fresh cluster bootstrap.Cause:
The current certificate parsing logic only decodes the first certificate and drops the rest.
Solution:
Fix the certificate decoding logic to keep all intermediate certs, only the first one is used for signing.
CHECKLIST
Jira
Needs Doc) and QA (Needs QA)?Tests
Config/Logging/Testability