weiguoqiang/cert-manager
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Remove references to CA private key from SelfSigned CSR controller

Browse Source 
Signed-off-by: joshvanl <vleeuwenjoshua@gmail.com>
This commit is contained in:
joshvanl 2021-06-15 12:13:52 +01:00
parent 72800ae0f2
commit 19f94c877d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/controller/certificatesigningrequests/selfsigned/selfsigned.go
View File

@ -89,7 +89,7 @@ func NewSelfSigned(ctx *controllerpkg.Context) *SelfSigned {
// should trigger a retry.
// CertificateSigningRequests must have the
// "experimental.cert-manager.io/private-key-secret-name" annotation present to
// be signed. This annotation must reference a valid Secret containing a CA
// be signed. This annotation must reference a valid Secret containing a
// private key for signing.
func (s *SelfSigned) Sign(ctx context.Context, csr *certificatesv1.CertificateSigningRequest, issuerObj cmapi.GenericIssuer) error {
log := logf.FromContext(ctx, "sign")
@ -117,7 +117,7 @@ func (s *SelfSigned) Sign(ctx context.Context, csr *certificatesv1.CertificateSi
}
if cmerrors.IsInvalidData(err) {
message := fmt.Sprintf("Failed to parse signing CA key from secret %s/%s", resourceNamespace, secretName)
message := fmt.Sprintf("Failed to parse signing key from secret %s/%s", resourceNamespace, secretName)
log.Error(err, message)
s.recorder.Eventf(csr, corev1.EventTypeWarning, "ErrorParsingKey", "%s: %s", message, err)
util.CertificateSigningRequestSetFailed(csr, "ErrorParsingKey", message)

4
pkg/controller/certificatesigningrequests/selfsigned/selfsigned_test.go
View File

@ -303,7 +303,7 @@ func TestProcessItem(t *testing.T) {
},
},
ExpectedEvents: []string{
`Warning ErrorParsingKey Failed to parse signing CA key from secret default-unit-test-ns/test-secret: error decoding private key PEM block`,
`Warning ErrorParsingKey Failed to parse signing key from secret default-unit-test-ns/test-secret: error decoding private key PEM block`,
},
ExpectedActions: []testpkg.Action{
@ -346,7 +346,7 @@ func TestProcessItem(t *testing.T) {
Type: certificatesv1.CertificateFailed,
Status: corev1.ConditionTrue,
Reason: "ErrorParsingKey",
Message: "Failed to parse signing CA key from secret default-unit-test-ns/test-secret",
Message: "Failed to parse signing key from secret default-unit-test-ns/test-secret",
LastTransitionTime: metaFixedClockStart,
LastUpdateTime: metaFixedClockStart,
}),