From ff3e4bb07d674820ad1e76d9c4d9ff0e165f5347 Mon Sep 17 00:00:00 2001 From: joshvanl Date: Fri, 9 Apr 2021 18:19:44 +0100 Subject: [PATCH] Don't fire an event when the Denied ready condition is set Signed-off-by: joshvanl --- pkg/controller/certificaterequests/util/reporter.go | 8 -------- .../certificaterequests/util/reporter_test.go | 12 +++++------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/pkg/controller/certificaterequests/util/reporter.go b/pkg/controller/certificaterequests/util/reporter.go index a2cfc49bb..cd0512f31 100644 --- a/pkg/controller/certificaterequests/util/reporter.go +++ b/pkg/controller/certificaterequests/util/reporter.go @@ -67,14 +67,6 @@ func (r *Reporter) Denied(cr *cmapi.CertificateRequest) { } message := "The CertificateRequest was denied by an approval controller" - - // If RequestDenied condition not already set then fire a RequestDenied - // Event. This is to reduce strain on the API server and avoid rate limiting - // ourselves for Event creation. - if apiutil.CertificateRequestReadyReason(cr) != cmapi.CertificateRequestReasonDenied { - r.recorder.Event(cr, corev1.EventTypeWarning, cmapi.CertificateRequestReasonDenied, message) - } - apiutil.SetCertificateRequestCondition(cr, cmapi.CertificateRequestConditionReady, cmmeta.ConditionFalse, cmapi.CertificateRequestReasonDenied, message) } diff --git a/pkg/controller/certificaterequests/util/reporter_test.go b/pkg/controller/certificaterequests/util/reporter_test.go index 32b98dc50..405e7a8be 100644 --- a/pkg/controller/certificaterequests/util/reporter_test.go +++ b/pkg/controller/certificaterequests/util/reporter_test.go @@ -102,7 +102,7 @@ func TestReporter(t *testing.T) { deniedReadyCondition := cmapi.CertificateRequestCondition{ Type: cmapi.CertificateRequestConditionReady, - Reason: "RequestDenied", + Reason: "Denied", Message: "The CertificateRequest was denied by an approval controller", Status: "False", LastTransitionTime: &nowMetaTime, @@ -213,18 +213,16 @@ func TestReporter(t *testing.T) { call: "ready", }, - "a denied report should update the conditions and send an event": { - certificateRequest: gen.CertificateRequestFrom(baseCR), - expectedEvents: []string{ - "Warning RequestDenied The CertificateRequest was denied by an approval controller", - }, + "a denied report should update the Ready condition to 'Denied'": { + certificateRequest: gen.CertificateRequestFrom(baseCR), + expectedEvents: []string{}, expectedConditions: []cmapi.CertificateRequestCondition{deniedReadyCondition}, expectedFailureTime: &nowMetaTime, call: "denied", }, - "a denied report should update the conditions and send an event, but not update failure time or send event if existing": { + "a denied report should update the Ready condition to 'Denied', but not update failure time existing": { certificateRequest: gen.CertificateRequestFrom(baseCR, gen.SetCertificateRequestStatusCondition(deniedReadyCondition), gen.SetCertificateRequestFailureTime(oldMetaTime),