bugfix: include all CA certificates in encoded pkcs12/jks stores

[bwaldrep]

Pull Request Motivation

Fixes #6803. When either a JKS or PKCS12 keystore is requested, the contents of the generated truststores should match the contents of the ca.crt field in the rendered secret. Previously if an issuer returned multiple concatenated CAs when signing a CertificateRequest only the first CA would be included in the truststores, despite the full set appearing in the ca.crt field.

Kind

/kind bug

Release Note

BUGFIX: JKS and PKCS12 stores now contain the full set of CAs specified by an issuer

[jetstack-bot]

Hi @bwaldrep. Thanks for your PR.

I'm waiting for a cert-manager member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[inteon]

Thanks @bwaldrep!
I'm very happy to receive these high-quality bugfix contributions.
/approve
/lgtm

[jetstack-bot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: inteon

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:

• OWNERS [inteon]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[inteon]

/cherrypick release-1.14

[jetstack-bot]

@inteon: once the present PR merges, I will cherry-pick it on top of release-1.14 in a new PR and assign it to you.

In response to this:

/cherrypick release-1.14

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[inteon]

/cherrypick release-1.13

[jetstack-bot]

@inteon: once the present PR merges, I will cherry-pick it on top of release-1.13 in a new PR and assign it to you.

In response to this:

/cherrypick release-1.13

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[inteon]

/cherrypick release-1.12

[jetstack-bot]

@inteon: once the present PR merges, I will cherry-pick it on top of release-1.12 in a new PR and assign it to you.

In response to this:

/cherrypick release-1.12

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[jetstack-bot]

@inteon: new pull request created: #6812

In response to this:

/cherrypick release-1.14

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[jetstack-bot]

@inteon: #6806 failed to apply on top of branch "release-1.13":

Applying: include full CA chain contents in encoded pkcs12/jks stores
Using index info to reconstruct a base tree...
M	pkg/controller/certificates/issuing/internal/keystore.go
M	pkg/controller/certificates/issuing/internal/keystore_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/controller/certificates/issuing/internal/keystore_test.go
Auto-merging pkg/controller/certificates/issuing/internal/keystore.go
CONFLICT (content): Merge conflict in pkg/controller/certificates/issuing/internal/keystore.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 include full CA chain contents in encoded pkcs12/jks stores
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-1.13

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[jetstack-bot]

@inteon: #6806 failed to apply on top of branch "release-1.12":

Applying: include full CA chain contents in encoded pkcs12/jks stores
Using index info to reconstruct a base tree...
M	pkg/controller/certificates/issuing/internal/keystore.go
M	pkg/controller/certificates/issuing/internal/keystore_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/controller/certificates/issuing/internal/keystore_test.go
Auto-merging pkg/controller/certificates/issuing/internal/keystore.go
CONFLICT (content): Merge conflict in pkg/controller/certificates/issuing/internal/keystore.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 include full CA chain contents in encoded pkcs12/jks stores
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-1.12

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.