Don't log issuance & renew success/failure twice

pkg/issuer/acme/issue.go

@@ -10,10 +10,8 @@ import (
 	"log"
 
 	"golang.org/x/crypto/acme"
-	"k8s.io/api/core/v1"
 	k8sErrors "k8s.io/apimachinery/pkg/api/errors"
 
-	"github.com/golang/glog"
 	"github.com/jetstack-experimental/cert-manager/pkg/apis/certmanager/v1alpha1"
 	"github.com/jetstack-experimental/cert-manager/pkg/util/kube"
 	"github.com/jetstack-experimental/cert-manager/pkg/util/pki"
@@ -94,16 +92,11 @@ func (a *Acme) Issue(crt *v1alpha1.Certificate) (v1alpha1.CertificateStatus, []b
 	key, cert, err := a.obtainCertificate(crt)
 	if err != nil {
 		s := messageErrorIssueCert + err.Error()
-		glog.Info(s)
-		a.recorder.Event(update, v1.EventTypeWarning, errorIssueCert, s)
 		update.UpdateStatusCondition(v1alpha1.CertificateConditionReady, v1alpha1.ConditionFalse, errorIssueCert, s)
 		return update.Status, nil, nil, err
 	}
 
-	s := messageCertIssued
-	glog.Info(s)
-	a.recorder.Event(update, v1.EventTypeNormal, successCertIssued, s)
-	update.UpdateStatusCondition(v1alpha1.CertificateConditionReady, v1alpha1.ConditionTrue, successCertIssued, s)
+	update.UpdateStatusCondition(v1alpha1.CertificateConditionReady, v1alpha1.ConditionTrue, successCertIssued, messageCertIssued)
 
 	return update.Status, key, cert, err
 }

pkg/issuer/acme/renew.go

@@ -1,26 +1,27 @@
 package acme
 
 import (
-	"github.com/golang/glog"
 	"github.com/jetstack-experimental/cert-manager/pkg/apis/certmanager/v1alpha1"
-	"k8s.io/api/core/v1"
+)
+
+const (
+	errorRenewCert        = "ErrRenewCert"
+	messageErrorRenewCert = "Error renewing TLS certificate: "
+
+	successCertRenewed = "CertRenewSuccess"
+	messageCertRenewed = "Certificate renewed successfully"
 )
 
 func (a *Acme) Renew(crt *v1alpha1.Certificate) (v1alpha1.CertificateStatus, []byte, []byte, error) {
 	update := crt.DeepCopy()
 	key, cert, err := a.obtainCertificate(crt)
 	if err != nil {
 		s := messageErrorIssueCert + err.Error()
-		glog.Info(s)
-		a.recorder.Event(update, v1.EventTypeWarning, errorIssueCert, s)
-		update.UpdateStatusCondition(v1alpha1.CertificateConditionReady, v1alpha1.ConditionFalse, errorIssueCert, s)
+		update.UpdateStatusCondition(v1alpha1.CertificateConditionReady, v1alpha1.ConditionFalse, errorRenewCert, s)
 		return update.Status, nil, nil, err
 	}
 
-	s := messageCertIssued
-	glog.Info(s)
-	a.recorder.Event(update, v1.EventTypeNormal, successCertIssued, s)
-	update.UpdateStatusCondition(v1alpha1.CertificateConditionReady, v1alpha1.ConditionTrue, successCertIssued, s)
+	update.UpdateStatusCondition(v1alpha1.CertificateConditionReady, v1alpha1.ConditionTrue, successCertRenewed, messageCertRenewed)
 
 	return update.Status, key, cert, err
 }

pkg/issuer/ca/issue.go

@@ -10,11 +10,9 @@ import (
 	"math/big"
 	"time"
 
-	"github.com/golang/glog"
 	"github.com/jetstack-experimental/cert-manager/pkg/apis/certmanager/v1alpha1"
 	"github.com/jetstack-experimental/cert-manager/pkg/util/kube"
 	"github.com/jetstack-experimental/cert-manager/pkg/util/pki"
-	"k8s.io/api/core/v1"
 	k8sErrors "k8s.io/apimachinery/pkg/api/errors"
 )
 
@@ -47,8 +45,6 @@ func (c *CA) Issue(crt *v1alpha1.Certificate) (v1alpha1.CertificateStatus, []byt
 
 	if err != nil {
 		s := messageErrorGetCertKeyPair + err.Error()
-		glog.Info(s)
-		c.recorder.Event(update, v1.EventTypeWarning, errorGetCertKeyPair, s)
 		update.UpdateStatusCondition(v1alpha1.CertificateConditionReady, v1alpha1.ConditionFalse, errorGetCertKeyPair, s)
 		return update.Status, nil, nil, err
 	}
@@ -57,16 +53,11 @@ func (c *CA) Issue(crt *v1alpha1.Certificate) (v1alpha1.CertificateStatus, []byt
 
 	if err != nil {
 		s := messageErrorIssueCert + err.Error()
-		glog.Info(s)
-		c.recorder.Event(update, v1.EventTypeWarning, errorIssueCert, s)
 		update.UpdateStatusCondition(v1alpha1.CertificateConditionReady, v1alpha1.ConditionFalse, errorIssueCert, s)
 		return update.Status, nil, nil, err
 	}
 
-	s := messageCertIssued
-	glog.Info(s)
-	c.recorder.Event(update, v1.EventTypeNormal, successCertIssued, s)
-	update.UpdateStatusCondition(v1alpha1.CertificateConditionReady, v1alpha1.ConditionTrue, successCertIssued, s)
+	update.UpdateStatusCondition(v1alpha1.CertificateConditionReady, v1alpha1.ConditionTrue, successCertIssued, messageCertIssued)
 
 	return update.Status, pki.EncodePKCS1PrivateKey(signeeKey), certPem, nil
 }

pkg/issuer/ca/renew.go

@@ -1,11 +1,9 @@
 package ca
 
 import (
-	"github.com/golang/glog"
 	"github.com/jetstack-experimental/cert-manager/pkg/apis/certmanager/v1alpha1"
 	"github.com/jetstack-experimental/cert-manager/pkg/util/kube"
 	"github.com/jetstack-experimental/cert-manager/pkg/util/pki"
-	"k8s.io/api/core/v1"
 )
 
 const (
@@ -25,8 +23,6 @@ func (c *CA) Renew(crt *v1alpha1.Certificate) (v1alpha1.CertificateStatus, []byt
 
 	if err != nil {
 		s := messageErrorGetCertKeyPair + err.Error()
-		glog.Info(s)
-		c.recorder.Event(update, v1.EventTypeWarning, errorGetCertKeyPair, s)
 		update.UpdateStatusCondition(v1alpha1.CertificateConditionReady, v1alpha1.ConditionFalse, errorGetCertKeyPair, s)
 		return update.Status, nil, nil, err
 	}
@@ -35,16 +31,11 @@ func (c *CA) Renew(crt *v1alpha1.Certificate) (v1alpha1.CertificateStatus, []byt
 
 	if err != nil {
 		s := messageErrorRenewCert + err.Error()
-		glog.Info(s)
-		c.recorder.Event(update, v1.EventTypeWarning, errorRenewCert, s)
 		update.UpdateStatusCondition(v1alpha1.CertificateConditionReady, v1alpha1.ConditionFalse, errorRenewCert, s)
 		return update.Status, nil, nil, err
 	}
 
-	s := messageCertRenewed
-	glog.Info(s)
-	c.recorder.Event(update, v1.EventTypeNormal, successCertRenewed, s)
-	update.UpdateStatusCondition(v1alpha1.CertificateConditionReady, v1alpha1.ConditionTrue, successCertRenewed, s)
+	update.UpdateStatusCondition(v1alpha1.CertificateConditionReady, v1alpha1.ConditionTrue, successCertRenewed, messageCertRenewed)
 
 	return update.Status, pki.EncodePKCS1PrivateKey(signeeKey), certPem, nil
 }