github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #20335 from aveshagarwal/master-integration-tests-issue 

Fix docker version errors in integration tests.
pull/6/head
Alex Robinson 2016-01-30 10:40:06 -08:00
parent 1362316c69 de804332f4
commit 5c53b3a13b
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/integration/integration.go
View File

@ -32,7 +32,6 @@ import (
"sync" "sync"
"time" "time"
docker "github.com/fsouza/go-dockerclient"
kubeletapp "k8s.io/kubernetes/cmd/kubelet/app" kubeletapp "k8s.io/kubernetes/cmd/kubelet/app"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
apierrors "k8s.io/kubernetes/pkg/api/errors" apierrors "k8s.io/kubernetes/pkg/api/errors"
@ -201,7 +200,6 @@ func startComponents(firstManifestURL, secondManifestURL string) (string, string
testRootDir := integration.MakeTempDirOrDie("kubelet_integ_1.", "") testRootDir := integration.MakeTempDirOrDie("kubelet_integ_1.", "")
configFilePath := integration.MakeTempDirOrDie("config", testRootDir) configFilePath := integration.MakeTempDirOrDie("config", testRootDir)
glog.Infof("Using %s as root dir for kubelet #1", testRootDir) glog.Infof("Using %s as root dir for kubelet #1", testRootDir)
fakeDocker1.VersionInfo = docker.Env{"ApiVersion=1.20"}
cm := cm.NewStubContainerManager() cm := cm.NewStubContainerManager()
kcfg := kubeletapp.SimpleKubelet( kcfg := kubeletapp.SimpleKubelet(
cl, cl,
@ -234,7 +232,6 @@ func startComponents(firstManifestURL, secondManifestURL string) (string, string
// have a place they can schedule. // have a place they can schedule.
testRootDir = integration.MakeTempDirOrDie("kubelet_integ_2.", "") testRootDir = integration.MakeTempDirOrDie("kubelet_integ_2.", "")
glog.Infof("Using %s as root dir for kubelet #2", testRootDir) glog.Infof("Using %s as root dir for kubelet #2", testRootDir)
fakeDocker2.VersionInfo = docker.Env{"ApiVersion=1.20"}
kcfg = kubeletapp.SimpleKubelet( kcfg = kubeletapp.SimpleKubelet(
cl, cl,

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

@ -57,7 +57,7 @@ type FakeDockerClient struct {
func NewFakeDockerClient() *FakeDockerClient { func NewFakeDockerClient() *FakeDockerClient {
return &FakeDockerClient{ return &FakeDockerClient{
VersionInfo: docker.Env{"Version=1.1.3", "ApiVersion=1.15"}, VersionInfo: docker.Env{"Version=1.8.1", "ApiVersion=1.20"},
Errors: make(map[string]error), Errors: make(map[string]error),
RemovedImages: sets.String{}, RemovedImages: sets.String{},
ContainerMap: make(map[string]*docker.Container), ContainerMap: make(map[string]*docker.Container),