From c6a0f820d807d4a2c104eda76fe7fa3f6e5f424d Mon Sep 17 00:00:00 2001
From: SataQiu <1527062125@qq.com>
Date: Fri, 31 May 2019 17:08:53 +0800
Subject: [PATCH] fix golint failures of pkg/kubelet/prober pkg/kubelet/secret

---
 hack/.golint_failures                |  2 --
 pkg/kubelet/prober/prober.go         | 14 +++++++-------
 pkg/kubelet/prober/prober_manager.go |  1 +
 pkg/kubelet/secret/fake_manager.go   |  1 +
 pkg/kubelet/secret/secret_manager.go |  2 ++
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/hack/.golint_failures b/hack/.golint_failures
index e3ce8377b9f..a0a42393a92 100644
--- a/hack/.golint_failures
+++ b/hack/.golint_failures
@@ -169,12 +169,10 @@ pkg/kubelet/lifecycle
 pkg/kubelet/metrics
 pkg/kubelet/pod/testing
 pkg/kubelet/preemption
-pkg/kubelet/prober
 pkg/kubelet/prober/results
 pkg/kubelet/prober/testing
 pkg/kubelet/qos
 pkg/kubelet/remote
-pkg/kubelet/secret
 pkg/kubelet/stats
 pkg/kubelet/status
 pkg/kubelet/status/testing
diff --git a/pkg/kubelet/prober/prober.go b/pkg/kubelet/prober/prober.go
index c489bcc9b72..383c6d5886f 100644
--- a/pkg/kubelet/prober/prober.go
+++ b/pkg/kubelet/prober/prober.go
@@ -50,8 +50,8 @@ type prober struct {
 	// probe types needs different httprobe instances so they don't
 	// share a connection pool which can cause collsions to the
 	// same host:port and transient failures. See #49740.
-	readinessHttp httprobe.Prober
-	livenessHttp  httprobe.Prober
+	readinessHTTP httprobe.Prober
+	livenessHTTP  httprobe.Prober
 	tcp           tcprobe.Prober
 	runner        kubecontainer.ContainerCommandRunner
 
@@ -69,8 +69,8 @@ func newProber(
 	const followNonLocalRedirects = false
 	return &prober{
 		exec:          execprobe.New(),
-		readinessHttp: httprobe.New(followNonLocalRedirects),
-		livenessHttp:  httprobe.New(followNonLocalRedirects),
+		readinessHTTP: httprobe.New(followNonLocalRedirects),
+		livenessHTTP:  httprobe.New(followNonLocalRedirects),
 		tcp:           tcprobe.New(),
 		runner:        runner,
 		refManager:    refManager,
@@ -175,10 +175,10 @@ func (pb *prober) runProbe(probeType probeType, p *v1.Probe, pod *v1.Pod, status
 		headers := buildHeader(p.HTTPGet.HTTPHeaders)
 		klog.V(4).Infof("HTTP-Probe Headers: %v", headers)
 		if probeType == liveness {
-			return pb.livenessHttp.Probe(url, headers, timeout)
-		} else { // readiness
-			return pb.readinessHttp.Probe(url, headers, timeout)
+			return pb.livenessHTTP.Probe(url, headers, timeout)
 		}
+		// readiness
+		return pb.readinessHTTP.Probe(url, headers, timeout)
 	}
 	if p.TCPSocket != nil {
 		port, err := extractPort(p.TCPSocket.Port, container)
diff --git a/pkg/kubelet/prober/prober_manager.go b/pkg/kubelet/prober/prober_manager.go
index 147082721cb..6f4fabd0af5 100644
--- a/pkg/kubelet/prober/prober_manager.go
+++ b/pkg/kubelet/prober/prober_manager.go
@@ -92,6 +92,7 @@ type manager struct {
 	prober *prober
 }
 
+// NewManager creates a new prober manager instance.
 func NewManager(
 	statusManager status.Manager,
 	livenessManager results.Manager,
diff --git a/pkg/kubelet/secret/fake_manager.go b/pkg/kubelet/secret/fake_manager.go
index ff80f9ee440..023582d97aa 100644
--- a/pkg/kubelet/secret/fake_manager.go
+++ b/pkg/kubelet/secret/fake_manager.go
@@ -25,6 +25,7 @@ import (
 type fakeManager struct {
 }
 
+// NewFakeManager creates empty/fake secret manager
 func NewFakeManager() Manager {
 	return &fakeManager{}
 }
diff --git a/pkg/kubelet/secret/secret_manager.go b/pkg/kubelet/secret/secret_manager.go
index 02e691b3b92..14c6572547a 100644
--- a/pkg/kubelet/secret/secret_manager.go
+++ b/pkg/kubelet/secret/secret_manager.go
@@ -33,6 +33,7 @@ import (
 	"k8s.io/apimachinery/pkg/watch"
 )
 
+// Manager interface provides methods for Kubelet to manage secrets.
 type Manager interface {
 	// Get secret by secret namespace and name.
 	GetSecret(namespace, name string) (*v1.Secret, error)
@@ -54,6 +55,7 @@ type simpleSecretManager struct {
 	kubeClient clientset.Interface
 }
 
+// NewSimpleSecretManager creates a new SecretManager instance.
 func NewSimpleSecretManager(kubeClient clientset.Interface) Manager {
 	return &simpleSecretManager{kubeClient: kubeClient}
 }