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

Merge pull request #23826 from gmarek/master

Browse Source 
Remove explicit docker api version from HollowNodes
This commit is contained in:
Marek Grabowski
2016-04-04 12:00:37 -07:00
parent 5470488aa5 4788eefbe3
commit ff08138128
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/kubemark/hollow-node.go
View File

@@ -20,8 +20,6 @@ import (
"fmt" "fmt"
"runtime" "runtime"
docker "github.com/fsouza/go-dockerclient"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/client/record"
client "k8s.io/kubernetes/pkg/client/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned"
@@ -103,7 +101,6 @@ func main() {
containerManager := cm.NewStubContainerManager() containerManager := cm.NewStubContainerManager()
fakeDockerClient := dockertools.NewFakeDockerClient() fakeDockerClient := dockertools.NewFakeDockerClient()
fakeDockerClient.VersionInfo = docker.Env{"Version=1.1.3", "ApiVersion=1.18"}
fakeDockerClient.EnableSleep = true fakeDockerClient.EnableSleep = true
hollowKubelet := kubemark.NewHollowKubelet( hollowKubelet := kubemark.NewHollowKubelet(