github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #40647 from NickrenREN/secretManager

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 41360, 41423, 41430, 40647, 41352)

optimize NewSimpleSecretManager and cleanupOrphanedPodCgroups
This commit is contained in:
Kubernetes Submit Queue 2017-02-15 05:06:11 -08:00 committed by GitHub
commit dd696683b7
4 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubelet/kubelet.go
View File

@ -465,11 +465,9 @@ func NewMainKubelet(kubeCfg *componentconfig.KubeletConfiguration, kubeDeps *Kub
experimentalHostUserNamespaceDefaulting: utilfeature.DefaultFeatureGate.Enabled(features.ExperimentalHostUserNamespaceDefaultingGate), experimentalHostUserNamespaceDefaulting: utilfeature.DefaultFeatureGate.Enabled(features.ExperimentalHostUserNamespaceDefaultingGate),
} }
secretManager, err := secret.NewCachingSecretManager( secretManager := secret.NewCachingSecretManager(
kubeDeps.KubeClient, secret.GetObjectTTLFromNodeFunc(klet.GetNode)) kubeDeps.KubeClient, secret.GetObjectTTLFromNodeFunc(klet.GetNode))
if err != nil {
return nil, fmt.Errorf("failed to initialize secret manager: %v", err)
}
klet.secretManager = secretManager klet.secretManager = secretManager
if klet.experimentalHostUserNamespaceDefaulting { if klet.experimentalHostUserNamespaceDefaulting {

3
pkg/kubelet/kubelet_pods.go
View File

@ -1504,7 +1504,7 @@ func (kl *Kubelet) GetPortForward(podName, podNamespace string, podUID types.UID
// running and whose volumes have been cleaned up. // running and whose volumes have been cleaned up.
func (kl *Kubelet) cleanupOrphanedPodCgroups( func (kl *Kubelet) cleanupOrphanedPodCgroups(
cgroupPods map[types.UID]cm.CgroupName, 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 // Add all running and existing terminated pods to a set allPods
allPods := sets.NewString() allPods := sets.NewString()
for _, pod := range pods { for _, pod := range pods {
@ -1534,7 +1534,6 @@ func (kl *Kubelet) cleanupOrphanedPodCgroups(
// again try to delete these unwanted pod cgroups // again try to delete these unwanted pod cgroups
go pcm.Destroy(val) go pcm.Destroy(val)
} }
return nil
} }
// enableHostUserNamespace determines if the host user namespace should be used by the container runtime. // enableHostUserNamespace determines if the host user namespace should be used by the container runtime.

5
pkg/kubelet/kubelet_test.go
View File

@ -174,10 +174,7 @@ func newTestKubeletWithImageList(
kubelet.cadvisor = mockCadvisor kubelet.cadvisor = mockCadvisor
fakeMirrorClient := podtest.NewFakeMirrorClient() fakeMirrorClient := podtest.NewFakeMirrorClient()
secretManager, err := secret.NewSimpleSecretManager(kubelet.kubeClient) secretManager := secret.NewSimpleSecretManager(kubelet.kubeClient)
if err != nil {
t.Fatalf("can't create a secret manager: %v", err)
}
kubelet.secretManager = secretManager kubelet.secretManager = secretManager
kubelet.podManager = kubepod.NewBasicPodManager(fakeMirrorClient, kubelet.secretManager) kubelet.podManager = kubepod.NewBasicPodManager(fakeMirrorClient, kubelet.secretManager)
kubelet.statusManager = status.NewManager(fakeKubeClient, kubelet.podManager) kubelet.statusManager = status.NewManager(fakeKubeClient, kubelet.podManager)

8
pkg/kubelet/secret/secret_manager.go
View File

@ -58,8 +58,8 @@ type simpleSecretManager struct {
kubeClient clientset.Interface kubeClient clientset.Interface
} }
func NewSimpleSecretManager(kubeClient clientset.Interface) (Manager, error) { func NewSimpleSecretManager(kubeClient clientset.Interface) Manager {
return &simpleSecretManager{kubeClient: kubeClient}, nil return &simpleSecretManager{kubeClient: kubeClient}
} }
func (s *simpleSecretManager) GetSecret(namespace, name string) (*v1.Secret, error) { func (s *simpleSecretManager) GetSecret(namespace, name string) (*v1.Secret, error) {
@ -247,12 +247,12 @@ type cachingSecretManager struct {
registeredPods map[objectKey]*v1.Pod registeredPods map[objectKey]*v1.Pod
} }
func NewCachingSecretManager(kubeClient clientset.Interface, getTTL GetObjectTTLFunc) (Manager, error) { func NewCachingSecretManager(kubeClient clientset.Interface, getTTL GetObjectTTLFunc) Manager {
csm := &cachingSecretManager{ csm := &cachingSecretManager{
secretStore: newSecretStore(kubeClient, clock.RealClock{}, getTTL, defaultTTL), secretStore: newSecretStore(kubeClient, clock.RealClock{}, getTTL, defaultTTL),
registeredPods: make(map[objectKey]*v1.Pod), registeredPods: make(map[objectKey]*v1.Pod),
} }
return csm, nil return csm
} }
func (c *cachingSecretManager) GetSecret(namespace, name string) (*v1.Secret, error) { func (c *cachingSecretManager) GetSecret(namespace, name string) (*v1.Secret, error) {