github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 22:46:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #103823 from liggitt/csr-cleaner-error

Browse Source 
Make CSR cleaner tolerate objects with invalid status.certificate
This commit is contained in:
Kubernetes Prow Robot 2021-07-21 16:47:51 -07:00 committed by GitHub
commit 1a9ae34549
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkg/controller/certificates/cleaner/cleaner.go
View File

@ -104,11 +104,7 @@ func (ccc *CSRCleanerController) worker() {
} }
func (ccc *CSRCleanerController) handle(csr *capi.CertificateSigningRequest) error { func (ccc *CSRCleanerController) handle(csr *capi.CertificateSigningRequest) error {
isIssuedExpired, err := isIssuedExpired(csr) if isIssuedPastDeadline(csr) || isDeniedPastDeadline(csr) || isFailedPastDeadline(csr) || isPendingPastDeadline(csr) || isIssuedExpired(csr) {
if err != nil {
return err
}
if isIssuedPastDeadline(csr) || isDeniedPastDeadline(csr) || isFailedPastDeadline(csr) || isPendingPastDeadline(csr) || isIssuedExpired {
if err := ccc.csrClient.Delete(context.TODO(), csr.Name, metav1.DeleteOptions{}); err != nil { if err := ccc.csrClient.Delete(context.TODO(), csr.Name, metav1.DeleteOptions{}); err != nil {
return fmt.Errorf("unable to delete CSR %q: %v", csr.Name, err) return fmt.Errorf("unable to delete CSR %q: %v", csr.Name, err)
} }
@ -118,18 +114,14 @@ func (ccc *CSRCleanerController) handle(csr *capi.CertificateSigningRequest) err
// isIssuedExpired checks if the CSR has been issued a certificate and if the // isIssuedExpired checks if the CSR has been issued a certificate and if the
// expiration of the certificate (the NotAfter value) has passed. // expiration of the certificate (the NotAfter value) has passed.
func isIssuedExpired(csr *capi.CertificateSigningRequest) (bool, error) { func isIssuedExpired(csr *capi.CertificateSigningRequest) bool {
isExpired, err := isExpired(csr)
if err != nil {
return false, err
}
for _, c := range csr.Status.Conditions { for _, c := range csr.Status.Conditions {
if c.Type == capi.CertificateApproved && isIssued(csr) && isExpired { if c.Type == capi.CertificateApproved && isIssued(csr) && isExpired(csr) {
klog.Infof("Cleaning CSR %q as the associated certificate is expired.", csr.Name) klog.Infof("Cleaning CSR %q as the associated certificate is expired.", csr.Name)
return true, nil return true
} }
} }
return false, nil return false
} }
// isPendingPastDeadline checks if the certificate has a Pending status and the // isPendingPastDeadline checks if the certificate has a Pending status and the
@ -198,20 +190,20 @@ func isIssued(csr *capi.CertificateSigningRequest) bool {
// isExpired checks if the CSR has a certificate and the date in the `NotAfter` // isExpired checks if the CSR has a certificate and the date in the `NotAfter`
// field has gone by. // field has gone by.
func isExpired(csr *capi.CertificateSigningRequest) (bool, error) { func isExpired(csr *capi.CertificateSigningRequest) bool {
if len(csr.Status.Certificate) == 0 { if len(csr.Status.Certificate) == 0 {
return false, nil return false
} }
block, _ := pem.Decode(csr.Status.Certificate) block, _ := pem.Decode(csr.Status.Certificate)
if block == nil { if block == nil {
return false, fmt.Errorf("expected the certificate associated with the CSR to be PEM encoded") return false
} }
certs, err := x509.ParseCertificates(block.Bytes) certs, err := x509.ParseCertificates(block.Bytes)
if err != nil { if err != nil {
return false, fmt.Errorf("unable to parse certificate data: %v", err) return false
} }
if len(certs) == 0 { if len(certs) == 0 {
return false, fmt.Errorf("no certificates found") return false
} }
return time.Now().After(certs[0].NotAfter), nil return time.Now().After(certs[0].NotAfter)
} }

12
pkg/controller/certificates/cleaner/cleaner_test.go
View File

@ -194,6 +194,18 @@ func TestCleanerWithApprovedExpiredCSR(t *testing.T) {
}, },
[]string{"delete"}, []string{"delete"},
}, },
{
"delete approved passed deadline unparseable",
metav1.NewTime(time.Now().Add(-1 * time.Minute)),
[]byte(`garbage`),
[]capi.CertificateSigningRequestCondition{
{
Type: capi.CertificateApproved,
LastUpdateTime: metav1.NewTime(time.Now().Add(-2 * time.Hour)),
},
},
[]string{"delete"},
},
} }
for _, tc := range testCases { for _, tc := range testCases {