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

trigger-controller: PR comment: rephrase log about skipping issuance

Browse Source 
The log message:

    multiple CertificateRequests found for the 'next' revision 2,
    skipping issuance until no more duplicate.

can be better phrased as:

    multiple CertificateRequests are found for the 'next' revision 2,
    issuance is skipped until there are no more duplicates.

Signed-off-by: Maël Valais <mael@vls.dev>
Co-authored-by: Josh Soref <jsoref@users.noreply.github.com>
This commit is contained in:
Maël Valais 2021-04-01 10:18:44 +02:00
parent 05c1fb9fc2
commit 85128f26ce
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controller/certificates/trigger/policies/gatherer_test.go
View File

@ -56,7 +56,7 @@ func TestDataForCertificate(t *testing.T) {
builder: &testpkg.Builder{},
wantSecret: nil,
},
"when no current or next CR exists, the returned cur and next CRs are nil": {
"when neither current nor next CRs exist, the returned cur and next CRs should be nil": {
givenCert: gen.Certificate("cert-1", gen.SetCertificateNamespace("default-unit-test-ns"),
gen.SetCertificateSecretName("secret-1"),
gen.SetCertificateUID("uid-1"),

10
pkg/controller/certificates/trigger/trigger_controller.go
View File

@ -199,12 +199,12 @@ func (c *controller) ProcessItem(ctx context.Context, key string) error {
return nil
}
// shouldBackoffReissuingOnFailure tells us if this certificate's
// re-issuance should be backed off and for how much time.
// shouldBackoffReissuingOnFailure tells us if we should back off
// re-issuing for this certificate and for how much time.
//
// The request can be left nil, in which case no back off is required. When
// the certificate doesn't match the request, no back off is required
// either since it means the request will have to be re-issued.
// The request can be left nil, in which case no back off is required.
// Additionally, if the certificate doesn't match the request, no back
// off is required because it means the request will have to be re-issued.
func shouldBackoffReissuingOnFailure(log logr.Logger, c clock.Clock, crt *cmapi.Certificate, nextCR *cmapi.CertificateRequest) (backoff bool, delay time.Duration) {
if crt.Status.LastFailureTime == nil {
return false, 0

2
test/e2e/suite/issuers/acme/certificate/http01.go
View File

@ -279,7 +279,7 @@ var _ = framework.CertManagerDescribe("ACME Certificate (HTTP01)", func() {
Expect(err).NotTo(HaveOccurred())
})
It("should allow updating the dns name of a failing certificate that had a wrong dns name", func() {
It("should allow updating the dns name of a failing certificate that had an incorrect dns name", func() {
certClient := f.CertManagerClientSet.CertmanagerV1().Certificates(f.Namespace.Name)
By("Creating a failing Certificate")

2
test/unit/gen/certificate.go
View File

@ -231,7 +231,7 @@ func AddCertificateLabels(labels map[string]string) CertificateModifier {
// give the full certificate. Only use this function for testing purposes.
//
// Note that the only "important" field that must be filled in ownerReference
// [1] is the UID. Must notably, the IsControlledBy function [2] only cares
// [1] is the UID. Most notably, the IsControlledBy function [2] only cares
// about the UID. The apiVersion, kind and name are only used for information
// purposes.
//