From 9393bd0fa6e1a271bf83678cfb08c81701608ca5 Mon Sep 17 00:00:00 2001 From: Michael Taufen Date: Mon, 20 Jun 2016 11:38:37 -0700 Subject: [PATCH] Fix unit test build errors These tests can just use the empty string for the PodInfraContainerImage. --- pkg/kubelet/dockertools/docker_manager_test.go | 5 ++--- pkg/kubelet/dockertools/docker_test.go | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkg/kubelet/dockertools/docker_manager_test.go b/pkg/kubelet/dockertools/docker_manager_test.go index cd9c90b2c68..39cca9f6c90 100644 --- a/pkg/kubelet/dockertools/docker_manager_test.go +++ b/pkg/kubelet/dockertools/docker_manager_test.go @@ -36,7 +36,6 @@ import ( dockerstrslice "github.com/docker/engine-api/types/strslice" cadvisorapi "github.com/google/cadvisor/info/v1" "github.com/stretchr/testify/assert" - "k8s.io/kubernetes/cmd/kubelet/app/options" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/apis/componentconfig" @@ -116,7 +115,7 @@ func createTestDockerManager(fakeHTTPClient *fakeHTTP, fakeDocker *FakeDockerCli proberesults.NewManager(), containerRefManager, &cadvisorapi.MachineInfo{}, - options.GetDefaultPodInfraContainerImage(), + "", 0, 0, "", &containertest.FakeOS{}, networkPlugin, @@ -535,7 +534,7 @@ func generatePodInfraContainerHash(pod *api.Pod) uint64 { container := &api.Container{ Name: PodInfraContainerName, - Image: options.GetDefaultPodInfraContainerImage(), + Image: "", Ports: ports, ImagePullPolicy: podInfraContainerImagePullPolicy, } diff --git a/pkg/kubelet/dockertools/docker_test.go b/pkg/kubelet/dockertools/docker_test.go index 1c063fe1aa0..bb2ef8a790f 100644 --- a/pkg/kubelet/dockertools/docker_test.go +++ b/pkg/kubelet/dockertools/docker_test.go @@ -30,7 +30,6 @@ import ( dockertypes "github.com/docker/engine-api/types" dockernat "github.com/docker/go-connections/nat" cadvisorapi "github.com/google/cadvisor/info/v1" - "k8s.io/kubernetes/cmd/kubelet/app/options" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/componentconfig" "k8s.io/kubernetes/pkg/client/record" @@ -653,7 +652,7 @@ func TestFindContainersByPod(t *testing.T) { fakeClient := NewFakeDockerClient() np, _ := network.InitNetworkPlugin([]network.NetworkPlugin{}, "", nettest.NewFakeHost(nil), componentconfig.HairpinNone, "10.0.0.0/8") // image back-off is set to nil, this test should not pull images - containerManager := NewFakeDockerManager(fakeClient, &record.FakeRecorder{}, nil, nil, &cadvisorapi.MachineInfo{}, options.GetDefaultPodInfraContainerImage(), 0, 0, "", &containertest.FakeOS{}, np, nil, nil, nil) + containerManager := NewFakeDockerManager(fakeClient, &record.FakeRecorder{}, nil, nil, &cadvisorapi.MachineInfo{}, "", 0, 0, "", &containertest.FakeOS{}, np, nil, nil, nil) for i, test := range tests { fakeClient.RunningContainerList = test.runningContainerList fakeClient.ExitedContainerList = test.exitedContainerList