github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Kubelet: pass the acutal pod for status update

Browse Source 
Pod status update should include the ObjectMeta of the pod. This change is
required for #5738 to merge.
This commit is contained in:
Yu-Ju Hong
2015-03-24 16:52:38 -07:00
parent 754cbea1f0
commit b4b0bc75c4
8 changed files with 120 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/kubelet/pod_manager.go
View File

@@ -46,7 +46,7 @@ type podManager interface {
GetPods() []api.Pod
GetPodByFullName(podFullName string) (*api.Pod, bool)
GetPodByName(namespace, name string) (*api.Pod, bool)
GetPodsAndMirrorMap() ([]api.Pod, map[string]*api.Pod)
GetPodsAndMirrorMap() ([]api.Pod, map[string]api.Pod)
SetPods(pods []api.Pod)
UpdatePods(u PodUpdate, podSyncTypes map[types.UID]metrics.SyncPodType)
DeleteOrphanedMirrorPods()
@@ -194,15 +194,15 @@ func (self *basicPodManager) GetPods() []api.Pod {
}
// GetPodsAndMirrorMap returns the a copy of the regular pods and the mirror
// pod map indexed by full name for existence check.
func (self *basicPodManager) GetPodsAndMirrorMap() ([]api.Pod, map[string]*api.Pod) {
// pods indexed by full name.
func (self *basicPodManager) GetPodsAndMirrorMap() ([]api.Pod, map[string]api.Pod) {
self.lock.RLock()
defer self.lock.RUnlock()
mirrorPodByFullName := make(map[string]*api.Pod)
for key, value := range self.mirrorPodByFullName {
mirrorPodByFullName[key] = value
mirrorPods := make(map[string]api.Pod)
for key, pod := range self.mirrorPodByFullName {
mirrorPods[key] = *pod
}
return self.getPods(), mirrorPodByFullName
return self.getPods(), mirrorPods
}
// GetPodByName provides the (non-mirror) pod that matches namespace and name,