Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

optimize NewSimpleSecretManager and cleanupOrphanedPodCgroups #40647

Merged
merged 1 commit into from
Feb 15, 2017
Merged

optimize NewSimpleSecretManager and cleanupOrphanedPodCgroups #40647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 2 additions & 4 deletions pkg/kubelet/kubelet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
3 changes: 1 addition & 2 deletions pkg/kubelet/kubelet_pods.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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.
Expand Down
5 changes: 1 addition & 4 deletions pkg/kubelet/kubelet_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions pkg/kubelet/secret/secret_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down