github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-13 22:05:59 +00:00
Code Issues Projects Releases Wiki Activity

pkg/kubelet: drop unnecessary receiver in pod_manager.go

Browse Source
This commit is contained in:
Xiang Li 2015-04-14 18:07:45 -07:00
parent ede4fb4a37
commit 864f9b4a8a
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/kubelet/pod_manager.go
View File

@ -179,24 +179,16 @@ func applyUpdates(changed []api.Pod, current []api.Pod) []api.Pod {
return updated 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. // GetPods returns the regular pods bound to the kubelet and their spec.
func (self *basicPodManager) GetPods() []api.Pod { func (self *basicPodManager) GetPods() []api.Pod {
self.lock.RLock() self.lock.RLock()
defer self.lock.RUnlock() defer self.lock.RUnlock()
return self.convertMapToPods(self.podByUID) return podsMapToPods(self.podByUID)
} }
// Returns all pods (including mirror pods). // Returns all pods (including mirror pods).
func (self *basicPodManager) getAllPods() []api.Pod { 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 // 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 { for key, pod := range self.mirrorPodByFullName {
mirrorPods[key] = *pod 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, // 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) 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
}