From 09dfa991f582942b50cb31803b8b9a3378123416 Mon Sep 17 00:00:00 2001
From: Joel Speed <Joel.speed@hotmail.co.uk>
Date: Wed, 26 Sep 2018 11:43:22 +0100
Subject: [PATCH] Lint

---
 pkg/internal/controller/metrics/metrics.go | 6 ++++++
 pkg/manager/internal.go                    | 4 +++-
 pkg/metrics/doc.go                         | 1 -
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkg/internal/controller/metrics/metrics.go b/pkg/internal/controller/metrics/metrics.go
index 14ccb2fc41..8691fb889f 100644
--- a/pkg/internal/controller/metrics/metrics.go
+++ b/pkg/internal/controller/metrics/metrics.go
@@ -22,16 +22,22 @@ import (
 )
 
 var (
+	// QueueLength is a prometheus metric which counts the current reconcile
+	// queue length per controller
 	QueueLength = prometheus.NewGaugeVec(prometheus.GaugeOpts{
 		Name: "controller_runtime_reconcile_queue_length",
 		Help: "Length of reconcile queue per controller",
 	}, []string{"controller"})
 
+	// ReconcileErrors is a prometheus counter metrics which holds the total
+	// number of errors from the Reconciler
 	ReconcileErrors = prometheus.NewCounterVec(prometheus.CounterOpts{
 		Name: "controller_runtime_reconcile_errors_total",
 		Help: "Total number of reconcile errors per controller",
 	}, []string{"controller"})
 
+	// ReconcileTime is a prometheus metric which keeps track of the duration
+	// of reconciles
 	ReconcileTime = prometheus.NewHistogramVec(prometheus.HistogramOpts{
 		Name: "controller_runtime_reconcile_time_second",
 		Help: "Length of time per reconcile per controller",
diff --git a/pkg/manager/internal.go b/pkg/manager/internal.go
index 5728666f5a..36fc311414 100644
--- a/pkg/manager/internal.go
+++ b/pkg/manager/internal.go
@@ -185,7 +185,9 @@ func (cm *controllerManager) serveMetrics(stop <-chan struct{}) {
 	// Shutdown the server when stop is closed
 	select {
 	case <-stop:
-		server.Shutdown(context.Background())
+		if err := server.Shutdown(context.Background()); err != nil {
+			cm.errChan <- err
+		}
 	}
 }
 
diff --git a/pkg/metrics/doc.go b/pkg/metrics/doc.go
index ad4fb5246f..6ed9df9514 100644
--- a/pkg/metrics/doc.go
+++ b/pkg/metrics/doc.go
@@ -17,5 +17,4 @@ limitations under the License.
 /*
 Package metrics contains controller related metrics utilities
 */
-
 package metrics