From f1e4e2b16c7634b20400921f38628bddb9efca1a Mon Sep 17 00:00:00 2001 From: JoshVanL Date: Tue, 13 Aug 2019 12:21:28 +0100 Subject: [PATCH] Remove fired event when a certificate request is re-scheduled when failed but < 1 hour Signed-off-by: JoshVanL --- pkg/controller/certificates/certificate_request.go | 3 +-- pkg/controller/certificates/certificate_request_test.go | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/controller/certificates/certificate_request.go b/pkg/controller/certificates/certificate_request.go index 937e51b92..f96d52a94 100644 --- a/pkg/controller/certificates/certificate_request.go +++ b/pkg/controller/certificates/certificate_request.go @@ -554,9 +554,8 @@ func (c *certificateRequestManager) processCertificate(ctx context.Context, crt return nil } + // We don't fire an event here as this could be called multiple times in quick succession c.scheduledWorkQueue.Add(key, time.Hour) - - c.recorder.Eventf(crt, corev1.EventTypeNormal, "CertificateRequestReschedule", "The CertificateRequest %q has failed and is scheduled for a retry in 1 hour", existingReq.Name) return nil } diff --git a/pkg/controller/certificates/certificate_request_test.go b/pkg/controller/certificates/certificate_request_test.go index 90ff7f4c7..41d34850a 100644 --- a/pkg/controller/certificates/certificate_request_test.go +++ b/pkg/controller/certificates/certificate_request_test.go @@ -1128,7 +1128,8 @@ func TestProcessCertificate(t *testing.T) { })), }, ExpectedActions: []testpkg.Action{}, - ExpectedEvents: []string{`Normal CertificateRequestReschedule The CertificateRequest "test-850937773" has failed and is scheduled for a retry in 1 hour`}, + // We don't fire an event here as this could be called multiple times in quick succession + ExpectedEvents: []string{}, }, }, }