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

Merge pull request #1696 from derekwaynecarr/pod_cache_needs_namespace

Browse Source 
Pod cache needs to be namespace-aware
This commit is contained in:
Brendan Burns
2014-10-10 08:28:32 -07:00
parent 60cf627a44 9e60bf1e43
commit 9ffa69ce15
7 changed files with 74 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/registry/pod/rest.go
View File

@@ -208,13 +208,13 @@ func (rs *REST) fillPodInfo(pod *api.Pod) {
// Get cached info for the list currently.
// TODO: Optionally use fresh info
if rs.podCache != nil {
info, err := rs.podCache.GetPodInfo(pod.CurrentState.Host, pod.ID)
info, err := rs.podCache.GetPodInfo(pod.CurrentState.Host, pod.Namespace, pod.ID)
if err != nil {
if err != client.ErrPodInfoNotAvailable {
glog.Errorf("Error getting container info from cache: %#v", err)
}
if rs.podInfoGetter != nil {
info, err = rs.podInfoGetter.GetPodInfo(pod.CurrentState.Host, pod.ID)
info, err = rs.podInfoGetter.GetPodInfo(pod.CurrentState.Host, pod.Namespace, pod.ID)
}
if err != nil {
if err != client.ErrPodInfoNotAvailable {

2
pkg/registry/pod/rest_test.go
View File

@@ -597,7 +597,7 @@ type FakePodInfoGetter struct {
err error
}
func (f *FakePodInfoGetter) GetPodInfo(host, podID string) (api.PodInfo, error) {
func (f *FakePodInfoGetter) GetPodInfo(host, podNamespace string, podID string) (api.PodInfo, error) {
return f.info, f.err
}