From 31bfefca3cc110b719a12feffa080717fd41b8c2 Mon Sep 17 00:00:00 2001
From: NickrenREN <yuquan.ren@easystack.cn>
Date: Sun, 22 Jan 2017 14:30:50 +0800
Subject: [PATCH] optimize NewSimpleSecretManager and cleanupOrphanedPodCgroups
 remove NewSimpleSecretManager second return value and
 cleanupOrphanedPodCgroups's return since they will never return err

---
 pkg/kubelet/kubelet.go               | 6 ++----
 pkg/kubelet/kubelet_pods.go          | 3 +--
 pkg/kubelet/kubelet_test.go          | 5 +----
 pkg/kubelet/secret/secret_manager.go | 8 ++++----
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go
index 654728be670..b6dd4fbf6d5 100644
--- a/pkg/kubelet/kubelet.go
+++ b/pkg/kubelet/kubelet.go
@@ -465,11 +465,9 @@ func NewMainKubelet(kubeCfg *componentconfig.KubeletConfiguration, kubeDeps *Kub
 		experimentalHostUserNamespaceDefaulting: utilfeature.DefaultFeatureGate.Enabled(features.ExperimentalHostUserNamespaceDefaultingGate),
 	}
 
-	secretManager, err := secret.NewCachingSecretManager(
+	secretManager := secret.NewCachingSecretManager(
 		kubeDeps.KubeClient, secret.GetObjectTTLFromNodeFunc(klet.GetNode))
-	if err != nil {
-		return nil, fmt.Errorf("failed to initialize secret manager: %v", err)
-	}
+
 	klet.secretManager = secretManager
 
 	if klet.experimentalHostUserNamespaceDefaulting {
diff --git a/pkg/kubelet/kubelet_pods.go b/pkg/kubelet/kubelet_pods.go
index c662f1a2ce0..49b5d7a3b06 100644
--- a/pkg/kubelet/kubelet_pods.go
+++ b/pkg/kubelet/kubelet_pods.go
@@ -1495,7 +1495,7 @@ func (kl *Kubelet) GetPortForward(podName, podNamespace string, podUID types.UID
 // running and whose volumes have been cleaned up.
 func (kl *Kubelet) cleanupOrphanedPodCgroups(
 	cgroupPods map[types.UID]cm.CgroupName,
-	pods []*v1.Pod, runningPods []*kubecontainer.Pod) error {
+	pods []*v1.Pod, runningPods []*kubecontainer.Pod) {
 	// Add all running and existing terminated pods to a set allPods
 	allPods := sets.NewString()
 	for _, pod := range pods {
@@ -1525,7 +1525,6 @@ func (kl *Kubelet) cleanupOrphanedPodCgroups(
 		// again try to delete these unwanted pod cgroups
 		go pcm.Destroy(val)
 	}
-	return nil
 }
 
 // enableHostUserNamespace determines if the host user namespace should be used by the container runtime.
diff --git a/pkg/kubelet/kubelet_test.go b/pkg/kubelet/kubelet_test.go
index 9db0360ffa8..284eb2b7726 100644
--- a/pkg/kubelet/kubelet_test.go
+++ b/pkg/kubelet/kubelet_test.go
@@ -174,10 +174,7 @@ func newTestKubeletWithImageList(
 	kubelet.cadvisor = mockCadvisor
 
 	fakeMirrorClient := podtest.NewFakeMirrorClient()
-	secretManager, err := secret.NewSimpleSecretManager(kubelet.kubeClient)
-	if err != nil {
-		t.Fatalf("can't create a secret manager: %v", err)
-	}
+	secretManager := secret.NewSimpleSecretManager(kubelet.kubeClient)
 	kubelet.secretManager = secretManager
 	kubelet.podManager = kubepod.NewBasicPodManager(fakeMirrorClient, kubelet.secretManager)
 	kubelet.statusManager = status.NewManager(fakeKubeClient, kubelet.podManager)
diff --git a/pkg/kubelet/secret/secret_manager.go b/pkg/kubelet/secret/secret_manager.go
index 17248307544..a2145e83ce4 100644
--- a/pkg/kubelet/secret/secret_manager.go
+++ b/pkg/kubelet/secret/secret_manager.go
@@ -58,8 +58,8 @@ type simpleSecretManager struct {
 	kubeClient clientset.Interface
 }
 
-func NewSimpleSecretManager(kubeClient clientset.Interface) (Manager, error) {
-	return &simpleSecretManager{kubeClient: kubeClient}, nil
+func NewSimpleSecretManager(kubeClient clientset.Interface) Manager {
+	return &simpleSecretManager{kubeClient: kubeClient}
 }
 
 func (s *simpleSecretManager) GetSecret(namespace, name string) (*v1.Secret, error) {
@@ -247,12 +247,12 @@ type cachingSecretManager struct {
 	registeredPods map[objectKey]*v1.Pod
 }
 
-func NewCachingSecretManager(kubeClient clientset.Interface, getTTL GetObjectTTLFunc) (Manager, error) {
+func NewCachingSecretManager(kubeClient clientset.Interface, getTTL GetObjectTTLFunc) Manager {
 	csm := &cachingSecretManager{
 		secretStore:    newSecretStore(kubeClient, clock.RealClock{}, getTTL, defaultTTL),
 		registeredPods: make(map[objectKey]*v1.Pod),
 	}
-	return csm, nil
+	return csm
 }
 
 func (c *cachingSecretManager) GetSecret(namespace, name string) (*v1.Secret, error) {