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

Merge pull request #4229 from JoshVanL/certificate-signing-request=event-not-approved

Browse Source 
Fire event when CertificateSigningRequest hasn't been Approved yet
This commit is contained in:
jetstack-bot 2021-07-23 12:23:08 +01:00 committed by GitHub
commit 3ee37e893d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/controller/certificatesigningrequests/ca/ca_test.go
View File

@ -183,11 +183,14 @@ func TestSign(t *testing.T) {
}
tests := map[string]testT{
"a CertificateSigningRequest without an approved condition should do nothing": {
"a CertificateSigningRequest without an approved condition should fire event": {
csr: baseCSRNotApproved.DeepCopy(),
builder: &testpkg.Builder{
KubeObjects: []runtime.Object{baseCSRNotApproved.DeepCopy()},
CertManagerObjects: []runtime.Object{baseIssuer.DeepCopy()},
ExpectedEvents: []string{
"Normal WaitingApproval Waiting for the Approved condition before issuing",
},
},
},
"a CertificateSigningRequest with a denied condition should do nothing": {

3
pkg/controller/certificatesigningrequests/controller_test.go
View File

@ -161,13 +161,14 @@ func TestController(t *testing.T) {
signerImpl: signerExpectNoCall,
sarReaction: sarReactionExpectNoCall,
},
"do nothing if CertificateSigningRequest is no yet approved": {
"fire event if CertificateSigningRequest is no yet approved": {
signerType: apiutil.IssuerCA,
existingCSR: gen.CertificateSigningRequest("csr-1",
gen.SetCertificateSigningRequestSignerName("issuers.cert-manager.io/hello.world"),
),
signerImpl: signerExpectNoCall,
sarReaction: sarReactionExpectNoCall,
wantEvent: "Normal WaitingApproval Waiting for the Approved condition before issuing",
},
"do nothing if CertificateSigningRequest already has a non empty Certificate present": {
signerType: apiutil.IssuerCA,

5
pkg/controller/certificatesigningrequests/selfsigned/selfsigned_test.go
View File

@ -136,10 +136,13 @@ func TestProcessItem(t *testing.T) {
fakeLister *testlisters.FakeSecretLister
expectedErr bool
}{
"a CertificateSigningRequest without an approved condition should do nothing": {
"a CertificateSigningRequest without an approved condition should fire an event": {
csr: gen.CertificateSigningRequestFrom(baseCSR),
builder: &testpkg.Builder{
CertManagerObjects: []runtime.Object{baseIssuer.DeepCopy()},
ExpectedEvents: []string{
"Normal WaitingApproval Waiting for the Approved condition before issuing",
},
},
},
"a CertificateSigningRequest with a denied condition should do nothing": {

5
pkg/controller/certificatesigningrequests/sync.go
View File

@ -58,7 +58,12 @@ func (c *Controller) Sync(ctx context.Context, csr *certificatesv1.CertificateSi
dbg.Info("certificate signing request has failed so skipping processing")
return nil
}
if util.CertificateSigningRequestIsDenied(csr) {
dbg.Info("certificate signing request has been denied so skipping processing")
return nil
}
if !util.CertificateSigningRequestIsApproved(csr) {
c.recorder.Event(csr, corev1.EventTypeNormal, "WaitingApproval", "Waiting for the Approved condition before issuing")
dbg.Info("certificate signing request is not approved so skipping processing")
return nil
}

5
pkg/controller/certificatesigningrequests/vault/vault_test.go
View File

@ -99,10 +99,13 @@ func TestProcessItem(t *testing.T) {
clientBuilder internalvault.ClientBuilder
expectedErr bool
}{
"a CertificateSigningRequest without an approved condition should do nothing": {
"a CertificateSigningRequest without an approved condition should fire an event": {
csr: gen.CertificateSigningRequestFrom(baseCSR),
builder: &testpkg.Builder{
CertManagerObjects: []runtime.Object{baseIssuer.DeepCopy()},
ExpectedEvents: []string{
"Normal WaitingApproval Waiting for the Approved condition before issuing",
},
},
},
"a CertificateSigningRequest with a denied condition should do nothing": {

5
pkg/controller/certificatesigningrequests/venafi/venafi_test.go
View File

@ -122,10 +122,13 @@ func TestProcessItem(t *testing.T) {
clientBuilder venaficlient.VenafiClientBuilder
expectedErr bool
}{
"a CertificateSigningRequest without an approved condition should do nothing": {
"a CertificateSigningRequest without an approved condition should fire an event": {
csr: gen.CertificateSigningRequestFrom(baseCSR),
builder: &testpkg.Builder{
CertManagerObjects: []runtime.Object{baseIssuer.DeepCopy()},
ExpectedEvents: []string{
"Normal WaitingApproval Waiting for the Approved condition before issuing",
},
},
},
"a CertificateSigningRequest with a denied condition should do nothing": {