Kubelet: wait until container runtime is up

Instead of waiting for the docker client to be up, we wait for the container
runtime to be up.
This commit is contained in:
Yu-Ju Hong
2015-05-04 13:14:55 -07:00
parent fbe3ec7513
commit d231eb6bef
4 changed files with 26 additions and 19 deletions

View File

@@ -263,7 +263,7 @@ func getDockerEndpoint(dockerEndpoint string) string {
func ConnectToDockerOrDie(dockerEndpoint string) DockerInterface {
if dockerEndpoint == "fake://" {
return &FakeDockerClient{
VersionInfo: []string{"apiVersion=1.16"},
VersionInfo: docker.Env{"ApiVersion=1.16"},
}
}
client, err := docker.NewClient(getDockerEndpoint(dockerEndpoint))