From eda71f9e95895b383624eb9dd44dd0b06f373170 Mon Sep 17 00:00:00 2001 From: shawnhanx Date: Mon, 8 Nov 2021 16:21:57 +0800 Subject: [PATCH 1/3] cleaner.go should use time.Until instead of t.Sub(time.Now()) --- pkg/controller/certificates/cleaner/cleaner.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/controller/certificates/cleaner/cleaner.go b/pkg/controller/certificates/cleaner/cleaner.go index 191c7974435..c1569e81368 100644 --- a/pkg/controller/certificates/cleaner/cleaner.go +++ b/pkg/controller/certificates/cleaner/cleaner.go @@ -176,9 +176,9 @@ func isIssuedPastDeadline(csr *capi.CertificateSigningRequest) bool { return false } -// isOlderThan checks that t is a non-zero time after time.Now() + d. +// isOlderThan checks that t is a non-zero time after time.Now() - d. func isOlderThan(t metav1.Time, d time.Duration) bool { - return !t.IsZero() && t.Sub(time.Now()) < -1*d + return !t.IsZero() && time.Until(t.Time) < -1*d } // isIssued checks if the CSR has `Issued` status. There is no explicit From 1e1e2dee90910bff7df6c4c79512b623936e23ee Mon Sep 17 00:00:00 2001 From: shawnhanx <59723284+shawnhanx@users.noreply.github.com> Date: Tue, 14 Jan 2025 14:18:51 +0800 Subject: [PATCH 2/3] Update pkg/controller/certificates/cleaner/cleaner.go Co-authored-by: Tim Hockin --- pkg/controller/certificates/cleaner/cleaner.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/controller/certificates/cleaner/cleaner.go b/pkg/controller/certificates/cleaner/cleaner.go index c1569e81368..f0699931ac4 100644 --- a/pkg/controller/certificates/cleaner/cleaner.go +++ b/pkg/controller/certificates/cleaner/cleaner.go @@ -176,7 +176,7 @@ func isIssuedPastDeadline(csr *capi.CertificateSigningRequest) bool { return false } -// isOlderThan checks that t is a non-zero time after time.Now() - d. +// isOlderThan checks that t is a non-zero and older than d from time.Now(). func isOlderThan(t metav1.Time, d time.Duration) bool { return !t.IsZero() && time.Until(t.Time) < -1*d } From ea644981df4d3125515f2eb1d63354047be8ef50 Mon Sep 17 00:00:00 2001 From: shawnhanx <59723284+shawnhanx@users.noreply.github.com> Date: Tue, 14 Jan 2025 14:19:16 +0800 Subject: [PATCH 3/3] Update pkg/controller/certificates/cleaner/cleaner.go Co-authored-by: Tim Hockin --- pkg/controller/certificates/cleaner/cleaner.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/controller/certificates/cleaner/cleaner.go b/pkg/controller/certificates/cleaner/cleaner.go index f0699931ac4..4f5c264cd02 100644 --- a/pkg/controller/certificates/cleaner/cleaner.go +++ b/pkg/controller/certificates/cleaner/cleaner.go @@ -178,7 +178,7 @@ func isIssuedPastDeadline(csr *capi.CertificateSigningRequest) bool { // isOlderThan checks that t is a non-zero and older than d from time.Now(). func isOlderThan(t metav1.Time, d time.Duration) bool { - return !t.IsZero() && time.Until(t.Time) < -1*d + return !t.IsZero() && time.Since(t.Time) > d } // isIssued checks if the CSR has `Issued` status. There is no explicit