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

Mark NodeNotReady for docker version below 1.6.2

Browse Source
This commit is contained in:
Dawn Chen
2015-10-21 13:04:10 -07:00
parent b691fd299c
commit a39e1e96dc
10 changed files with 197 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/integration/integration.go
View File

@@ -215,7 +215,7 @@ func startComponents(firstManifestURL, secondManifestURL string) (string, string
testRootDir := integration.MakeTempDirOrDie("kubelet_integ_1.", "")
configFilePath := integration.MakeTempDirOrDie("config", testRootDir)
glog.Infof("Using %s as root dir for kubelet #1", testRootDir)
fakeDocker1.VersionInfo = docker.Env{"ApiVersion=1.15"}
fakeDocker1.VersionInfo = docker.Env{"ApiVersion=1.20"}
kcfg := kubeletapp.SimpleKubelet(
cl,
@@ -246,7 +246,7 @@ func startComponents(firstManifestURL, secondManifestURL string) (string, string
// have a place they can schedule.
testRootDir = integration.MakeTempDirOrDie("kubelet_integ_2.", "")
glog.Infof("Using %s as root dir for kubelet #2", testRootDir)
fakeDocker2.VersionInfo = docker.Env{"ApiVersion=1.15"}
fakeDocker2.VersionInfo = docker.Env{"ApiVersion=1.20"}
kcfg = kubeletapp.SimpleKubelet(
cl,