From 1181a88cf233331b39ae0902f50dfcc52f0cec6c Mon Sep 17 00:00:00 2001
From: Mike Danese <mikedanese@google.com>
Date: Mon, 23 Oct 2017 11:31:10 -0700
Subject: [PATCH] certs: remove always nil error from New signature

---
 .../app/gke_certificates_controller.go                    | 5 +----
 cmd/kube-controller-manager/app/certificates.go           | 8 +-------
 pkg/controller/certificates/approver/sarapprove.go        | 2 +-
 pkg/controller/certificates/certificate_controller.go     | 4 ++--
 .../certificates/certificate_controller_test.go           | 5 +----
 pkg/controller/certificates/signer/cfssl_signer.go        | 2 +-
 6 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/cmd/gke-certificates-controller/app/gke_certificates_controller.go b/cmd/gke-certificates-controller/app/gke_certificates_controller.go
index cc274d9253..9e9db774c9 100644
--- a/cmd/gke-certificates-controller/app/gke_certificates_controller.go
+++ b/cmd/gke-certificates-controller/app/gke_certificates_controller.go
@@ -77,14 +77,11 @@ func Run(s *GKECertificatesController) error {
 		return err
 	}
 
-	controller, err := certificates.NewCertificateController(
+	controller := certificates.NewCertificateController(
 		client,
 		sharedInformers.Certificates().V1beta1().CertificateSigningRequests(),
 		signer.handle,
 	)
-	if err != nil {
-		return err
-	}
 
 	sharedInformers.Start(nil)
 	controller.Run(5, nil) // runs forever
diff --git a/cmd/kube-controller-manager/app/certificates.go b/cmd/kube-controller-manager/app/certificates.go
index b3e4e8499d..79c9390b58 100644
--- a/cmd/kube-controller-manager/app/certificates.go
+++ b/cmd/kube-controller-manager/app/certificates.go
@@ -59,16 +59,10 @@ func startCSRApprovingController(ctx ControllerContext) (bool, error) {
 		return false, nil
 	}
 
-	approver, err := approver.NewCSRApprovingController(
+	approver := approver.NewCSRApprovingController(
 		ctx.ClientBuilder.ClientOrDie("certificate-controller"),
 		ctx.InformerFactory.Certificates().V1beta1().CertificateSigningRequests(),
 	)
-	if err != nil {
-		// TODO this is failing consistently in test-cmd and local-up-cluster.sh.  Fix them and make it consistent with all others which
-		// cause a crash loop
-		glog.Errorf("Failed to start certificate controller: %v", err)
-		return false, nil
-	}
 	go approver.Run(1, ctx.Stop)
 
 	return true, nil
diff --git a/pkg/controller/certificates/approver/sarapprove.go b/pkg/controller/certificates/approver/sarapprove.go
index d2eb5ac5ef..1a105bd5a5 100644
--- a/pkg/controller/certificates/approver/sarapprove.go
+++ b/pkg/controller/certificates/approver/sarapprove.go
@@ -44,7 +44,7 @@ type sarApprover struct {
 	recognizers []csrRecognizer
 }
 
-func NewCSRApprovingController(client clientset.Interface, csrInformer certificatesinformers.CertificateSigningRequestInformer) (*certificates.CertificateController, error) {
+func NewCSRApprovingController(client clientset.Interface, csrInformer certificatesinformers.CertificateSigningRequestInformer) *certificates.CertificateController {
 	approver := &sarApprover{
 		client:      client,
 		recognizers: recognizers(),
diff --git a/pkg/controller/certificates/certificate_controller.go b/pkg/controller/certificates/certificate_controller.go
index 2caa30de32..1484f4d41a 100644
--- a/pkg/controller/certificates/certificate_controller.go
+++ b/pkg/controller/certificates/certificate_controller.go
@@ -53,7 +53,7 @@ func NewCertificateController(
 	kubeClient clientset.Interface,
 	csrInformer certificatesinformers.CertificateSigningRequestInformer,
 	handler func(*certificates.CertificateSigningRequest) error,
-) (*CertificateController, error) {
+) *CertificateController {
 	// Send events to the apiserver
 	eventBroadcaster := record.NewBroadcaster()
 	eventBroadcaster.StartLogging(glog.Infof)
@@ -98,7 +98,7 @@ func NewCertificateController(
 	cc.csrLister = csrInformer.Lister()
 	cc.csrsSynced = csrInformer.Informer().HasSynced
 	cc.handler = handler
-	return cc, nil
+	return cc
 }
 
 // Run the main goroutine responsible for watching and syncing jobs.
diff --git a/pkg/controller/certificates/certificate_controller_test.go b/pkg/controller/certificates/certificate_controller_test.go
index 20a858b4bb..8805fbfcef 100644
--- a/pkg/controller/certificates/certificate_controller_test.go
+++ b/pkg/controller/certificates/certificate_controller_test.go
@@ -54,14 +54,11 @@ func TestCertificateController(t *testing.T) {
 		return nil
 	}
 
-	controller, err := NewCertificateController(
+	controller := NewCertificateController(
 		client,
 		informerFactory.Certificates().V1beta1().CertificateSigningRequests(),
 		handler,
 	)
-	if err != nil {
-		t.Fatalf("error creating controller: %v", err)
-	}
 	controller.csrsSynced = func() bool { return true }
 
 	stopCh := make(chan struct{})
diff --git a/pkg/controller/certificates/signer/cfssl_signer.go b/pkg/controller/certificates/signer/cfssl_signer.go
index 1a5f3ff7e7..b403a51ce4 100644
--- a/pkg/controller/certificates/signer/cfssl_signer.go
+++ b/pkg/controller/certificates/signer/cfssl_signer.go
@@ -50,7 +50,7 @@ func NewCSRSigningController(
 		client,
 		csrInformer,
 		signer.handle,
-	)
+	), nil
 }
 
 type cfsslSigner struct {