diff --git a/hack/.golint_failures b/hack/.golint_failures
index 2d9dbd53c6a..4e2d363fe11 100644
--- a/hack/.golint_failures
+++ b/hack/.golint_failures
@@ -59,6 +59,7 @@ pkg/controller/certificates/signer
 pkg/controller/certificates/signer/config/v1alpha1
 pkg/controller/cloud
 pkg/controller/clusterroleaggregation
+pkg/controller/cronjob
 pkg/controller/daemon
 pkg/controller/daemon/config/v1alpha1
 pkg/controller/deployment
@@ -116,7 +117,6 @@ pkg/kubelet/apis/deviceplugin/v1beta1
 pkg/kubelet/checkpointmanager/testing/example_checkpoint_formats/v1
 pkg/kubelet/client
 pkg/kubelet/cm
-pkg/kubelet/config
 pkg/kubelet/container
 pkg/kubelet/container/testing
 pkg/kubelet/dockershim
@@ -129,7 +129,6 @@ pkg/kubelet/dockershim/network/kubenet
 pkg/kubelet/dockershim/network/testing
 pkg/kubelet/events
 pkg/kubelet/lifecycle
-pkg/kubelet/metrics
 pkg/kubelet/pluginmanager/pluginwatcher
 pkg/kubelet/pod/testing
 pkg/kubelet/preemption
diff --git a/pkg/kubelet/config/BUILD b/pkg/kubelet/config/BUILD
index 9cc9827deab..486a36edf57 100644
--- a/pkg/kubelet/config/BUILD
+++ b/pkg/kubelet/config/BUILD
@@ -21,7 +21,6 @@ go_library(
         "//pkg/api/legacyscheme:go_default_library",
         "//pkg/apis/core:go_default_library",
         "//pkg/apis/core/helper:go_default_library",
-        "//pkg/apis/core/install:go_default_library",
         "//pkg/apis/core/v1:go_default_library",
         "//pkg/apis/core/validation:go_default_library",
         "//pkg/kubelet/checkpoint:go_default_library",
diff --git a/pkg/kubelet/config/file_linux.go b/pkg/kubelet/config/file_linux.go
index 37f3dd0de4f..ad730e47e34 100644
--- a/pkg/kubelet/config/file_linux.go
+++ b/pkg/kubelet/config/file_linux.go
@@ -129,7 +129,8 @@ func (s *sourceFile) produceWatchEvent(e *fsnotify.Event) error {
 func (s *sourceFile) consumeWatchEvent(e *watchEvent) error {
 	switch e.eventType {
 	case podAdd, podModify:
-		if pod, err := s.extractFromFile(e.fileName); err != nil {
+		pod, err := s.extractFromFile(e.fileName)
+		if err != nil {
 			return fmt.Errorf("can't process config file %q: %v", e.fileName, err)
 		}
 		return s.store.Add(pod)
diff --git a/pkg/kubelet/metrics/metrics.go b/pkg/kubelet/metrics/metrics.go
index e72e8f60484..52717f7b1c7 100644
--- a/pkg/kubelet/metrics/metrics.go
+++ b/pkg/kubelet/metrics/metrics.go
@@ -86,7 +86,7 @@ const (
 )
 
 var (
-	// NodeName is a Gauge that tracks the name of the assigned via the label "node_key".
+	// NodeName is a Gauge that tracks the ode's name. The count is always 1.
 	NodeName = prometheus.NewGaugeVec(
 		prometheus.GaugeOpts{
 			Subsystem: KubeletSubsystem,
@@ -115,7 +115,7 @@ var (
 		},
 		[]string{"operation_type"},
 	)
-	// PodStartDuration is a Histogram that tracks the duration (in seconds) it takes for single pod to go from pending to running.
+	// PodStartDuration is a Histogram that tracks the duration (in seconds) it takes for a single pod to go from pending to running.
 	PodStartDuration = prometheus.NewHistogram(
 		prometheus.HistogramOpts{
 			Subsystem: KubeletSubsystem,