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

Merge pull request #4117 from wojtek-t/validate_docker_version

Browse Source 
Check Docker version in Kubelet /healthz handler
This commit is contained in:
Brendan Burns
2015-02-05 10:06:33 -08:00
parent 253752d830 1a3419f970
commit 8b25b43039
10 changed files with 94 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/dockertools/docker_test.go
View File

@@ -123,7 +123,7 @@ func TestContainerManifestNaming(t *testing.T) {
func TestGetDockerServerVersion(t *testing.T) {
fakeDocker := &FakeDockerClient{VersionInfo: docker.Env{"Client version=1.2", "Server version=1.1.3", "Server API version=1.15"}}
runner := dockerContainerCommandRunner{fakeDocker}
version, err := runner.getDockerServerVersion()
version, err := runner.GetDockerServerVersion()
if err != nil {
t.Errorf("got error while getting docker server version - %s", err)
}