Commit ff081381 authored by Marek Grabowski's avatar Marek Grabowski

Merge pull request #23826 from gmarek/master

Remove explicit docker api version from HollowNodes
parents 5470488a 4788eefb
...@@ -20,8 +20,6 @@ import ( ...@@ -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() { ...@@ -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(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment