github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-17 07:03:31 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Revert "Add an api object for the kubelet, and a versioned endpoint.""

Browse Source 
This reverts commit dcfcf315e5.
This commit is contained in:
Brendan Burns
2014-12-15 09:29:04 -08:00
parent 1abc3e423c
commit a6f967b6e7
16 changed files with 122 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -230,8 +230,8 @@ func (rs *REST) fillPodInfo(pod *api.Pod) {
return
}
}
pod.Status.Info = info
netContainerInfo, ok := info["net"]
pod.Status.Info = info.ContainerInfo
netContainerInfo, ok := pod.Status.Info["net"]
if ok {
if netContainerInfo.PodIP != "" {
pod.Status.PodIP = netContainerInfo.PodIP

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

@@ -566,8 +566,8 @@ type FakePodInfoGetter struct {
err error
}
func (f *FakePodInfoGetter) GetPodInfo(host, podNamespace string, podID string) (api.PodInfo, error) {
return f.info, f.err
func (f *FakePodInfoGetter) GetPodInfo(host, podNamespace string, podID string) (api.PodContainerInfo, error) {
return api.PodContainerInfo{ContainerInfo: f.info}, f.err
}
func TestFillPodInfo(t *testing.T) {