From 864f9b4a8afb5833be37746439cb7c7ca7457118 Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Tue, 14 Apr 2015 18:07:45 -0700 Subject: [PATCH] pkg/kubelet: drop unnecessary receiver in pod_manager.go --- pkg/kubelet/pod_manager.go | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkg/kubelet/pod_manager.go b/pkg/kubelet/pod_manager.go index 1c4984cc067..6df8d5ee628 100644 --- a/pkg/kubelet/pod_manager.go +++ b/pkg/kubelet/pod_manager.go @@ -179,24 +179,16 @@ func applyUpdates(changed []api.Pod, current []api.Pod) []api.Pod { return updated } -func (self *basicPodManager) convertMapToPods(UIDMap map[types.UID]*api.Pod) []api.Pod { - pods := make([]api.Pod, 0, len(UIDMap)) - for _, pod := range UIDMap { - pods = append(pods, *pod) - } - return pods -} - // GetPods returns the regular pods bound to the kubelet and their spec. func (self *basicPodManager) GetPods() []api.Pod { self.lock.RLock() defer self.lock.RUnlock() - return self.convertMapToPods(self.podByUID) + return podsMapToPods(self.podByUID) } // Returns all pods (including mirror pods). func (self *basicPodManager) getAllPods() []api.Pod { - return append(self.convertMapToPods(self.podByUID), self.convertMapToPods(self.mirrorPodByUID)...) + return append(podsMapToPods(self.podByUID), podsMapToPods(self.mirrorPodByUID)...) } // GetPodsAndMirrorMap returns the a copy of the regular pods and the mirror @@ -208,7 +200,7 @@ func (self *basicPodManager) GetPodsAndMirrorMap() ([]api.Pod, map[string]api.Po for key, pod := range self.mirrorPodByFullName { mirrorPods[key] = *pod } - return self.convertMapToPods(self.podByUID), mirrorPods + return podsMapToPods(self.podByUID), mirrorPods } // GetPodByName provides the (non-mirror) pod that matches namespace and name, @@ -279,3 +271,11 @@ func (self *basicPodManager) IsMirrorPodOf(mirrorPod, pod *api.Pod) bool { } return api.Semantic.DeepEqual(&pod.Spec, &mirrorPod.Spec) } + +func podsMapToPods(UIDMap map[types.UID]*api.Pod) []api.Pod { + pods := make([]api.Pod, 0, len(UIDMap)) + for _, pod := range UIDMap { + pods = append(pods, *pod) + } + return pods +}