From 09f91a2a99c679c85d27daf1372fcc23e2279d7e Mon Sep 17 00:00:00 2001 From: joshvanl Date: Mon, 8 Mar 2021 13:34:23 +0000 Subject: [PATCH] Update approver controller to use new Denied condition type Signed-off-by: joshvanl --- .../certificaterequests/approver/approver_test.go | 4 ++-- pkg/controller/certificaterequests/approver/sync.go | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/controller/certificaterequests/approver/approver_test.go b/pkg/controller/certificaterequests/approver/approver_test.go index 6d200af51..c3d8bb56a 100644 --- a/pkg/controller/certificaterequests/approver/approver_test.go +++ b/pkg/controller/certificaterequests/approver/approver_test.go @@ -83,8 +83,8 @@ func TestProcessItem(t *testing.T) { Status: cmapi.CertificateRequestStatus{ Conditions: []cmapi.CertificateRequestCondition{ { - Type: cmapi.CertificateRequestConditionApproved, - Status: cmmeta.ConditionFalse, + Type: cmapi.CertificateRequestConditionDenied, + Status: cmmeta.ConditionTrue, }, }, }, diff --git a/pkg/controller/certificaterequests/approver/sync.go b/pkg/controller/certificaterequests/approver/sync.go index 69e83b7df..eeb4d2aaf 100644 --- a/pkg/controller/certificaterequests/approver/sync.go +++ b/pkg/controller/certificaterequests/approver/sync.go @@ -33,18 +33,18 @@ const ( ) // Sync will set the "Approved" condition to True on synced -// CertificateRequests. If the "Denied", "Approved" or "Ready" condition alrady -// exists, exit early. +// CertificateRequests. If the "Denied", "Approved" or "Ready" condition +// already exists, exit early. func (c *Controller) Sync(ctx context.Context, cr *cmapi.CertificateRequest) (err error) { log := logf.FromContext(ctx, "approver") switch { case // If the CertificateRequest has already been approved, exit early. - apiutil.CertificateRequestHasApproved(cr), + apiutil.CertificateRequestIsApproved(cr), // If the CertificateRequest has already been denied, exit early. - apiutil.CertificateRequestHasDenied(cr), + apiutil.CertificateRequestIsDenied(cr), // If the CertificateRequest is "Issued" or "Failed", exit early. apiutil.CertificateRequestReadyReason(cr) == cmapi.CertificateRequestReasonFailed,