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

Don't fire an event when the Denied ready condition is set

Browse Source 
Signed-off-by: joshvanl <vleeuwenjoshua@gmail.com>
This commit is contained in:
joshvanl 2021-04-09 18:19:44 +01:00
parent 9a5e36e732
commit ff3e4bb07d
2 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/controller/certificaterequests/util/reporter.go
View File

@ -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)
}

12
pkg/controller/certificaterequests/util/reporter_test.go
View File

@ -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),