Merge pull request #5555 from fgrzadkowski/sync_pod_status

Periodically update pod status from kubelet.
2015-03-18 10:14:07 -07:00
parent e92067d102 1a352b74ba
commit 9586b39bb7
12 changed files with 95 additions and 47 deletions
--- a/pkg/kubelet/dockertools/fake_docker_client.go
+++ b/pkg/kubelet/dockertools/fake_docker_client.go
@@ -126,6 +126,7 @@ func (f *FakeDockerClient) StartContainer(id string, hostConfig *docker.HostConf
 			Running: true,
 			Pid:     42,
 		},
+		NetworkSettings: &docker.NetworkSettings{IPAddress: "1.2.3.4"},
 	}
 	return f.Err
 }