diff --git a/test/e2e/framework/helper/certificaterequests.go b/test/e2e/framework/helper/certificaterequests.go index 1b3580261..b1a7731b7 100644 --- a/test/e2e/framework/helper/certificaterequests.go +++ b/test/e2e/framework/helper/certificaterequests.go @@ -186,8 +186,11 @@ func (h *Helper) ValidateIssuedCertificateRequest(cr *cmapi.CertificateRequest, } } - if !apiutil.CertificateRequestHasApproved(cr) { - return nil, fmt.Errorf("CertificateRequest does not have an Approved condition: %+v", cr.Status.Conditions) + if !apiutil.CertificateRequestIsApproved(cr) { + return nil, fmt.Errorf("CertificateRequest does not have an Approved condition set to True: %+v", cr.Status.Conditions) + } + if apiutil.CertificateRequestIsDenied(cr) { + return nil, fmt.Errorf("CertificateRequest has a Denied conditon set to True: %+v", cr.Status.Conditions) } return cert, nil diff --git a/test/unit/gen/certificaterequest.go b/test/unit/gen/certificaterequest.go index a24fbd0fe..39a1335a3 100644 --- a/test/unit/gen/certificaterequest.go +++ b/test/unit/gen/certificaterequest.go @@ -96,6 +96,12 @@ func SetCertificateRequestStatusCondition(c v1.CertificateRequestCondition) Cert } } +func AddCertificateRequestStatusCondition(c v1.CertificateRequestCondition) CertificateRequestModifier { + return func(cr *v1.CertificateRequest) { + cr.Status.Conditions = append(cr.Status.Conditions, c) + } +} + func SetCertificateRequestNamespace(namespace string) CertificateRequestModifier { return func(cr *v1.CertificateRequest) { cr.ObjectMeta.Namespace = namespace