Merge pull request #39826 from shyamjvs/fake-docker-client-fix

cmd/kubemark/hollow-node.go

@@ -110,7 +110,7 @@ func main() {
 		cadvisorInterface := new(cadvisortest.Fake)
 		containerManager := cm.NewStubContainerManager()
 
-		fakeDockerClient := dockertools.NewFakeDockerClient()
+		fakeDockerClient := dockertools.NewFakeDockerClient().WithTraceDisabled()
 		fakeDockerClient.EnableSleep = true
 
 		hollowKubelet := kubemark.NewHollowKubelet(

pkg/kubelet/dockershim/docker_service_test.go

@@ -40,7 +40,7 @@ func newTestNetworkPlugin(t *testing.T) *mock_network.MockNetworkPlugin {
 
 func newTestDockerService() (*dockerService, *dockertools.FakeDockerClient, *clock.FakeClock) {
 	fakeClock := clock.NewFakeClock(time.Time{})
-	c := dockertools.NewFakeDockerClientWithClock(fakeClock)
+	c := dockertools.NewFakeDockerClient().WithClock(fakeClock)
 	return &dockerService{client: c, os: &containertest.FakeOS{}, networkPlugin: &network.NoopNetworkPlugin{}}, c, fakeClock
 }
 

pkg/kubelet/dockertools/container_gc_test.go

@@ -31,7 +31,7 @@ import (
 )
 
 func newTestContainerGC(t *testing.T) (*containerGC, *FakeDockerClient) {
-	fakeDocker := new(FakeDockerClient)
+	fakeDocker := NewFakeDockerClient()
 	fakePodGetter := newFakePodGetter()
 	gc := NewContainerGC(fakeDocker, fakePodGetter, "")
 	return gc, fakeDocker

pkg/kubelet/dockertools/docker_manager_test.go

@@ -165,7 +165,7 @@ func newTestDockerManagerWithHTTPClient(fakeHTTPClient *fakeHTTP) (*DockerManage
 }
 
 func newTestDockerManagerWithVersion(version, apiVersion string) (*DockerManager, *FakeDockerClient) {
-	fakeDocker := NewFakeDockerClientWithVersion(version, apiVersion)
+	fakeDocker := NewFakeDockerClient().WithVersion(version, apiVersion)
 	return createTestDockerManagerWithFakeImageManager(nil, fakeDocker)
 }
 

pkg/kubelet/dockertools/images_test.go

@@ -24,7 +24,7 @@ import (
 )
 
 func TestImageStatsNoImages(t *testing.T) {
-	fakeDockerClient := NewFakeDockerClientWithVersion("1.2.3", "1.2")
+	fakeDockerClient := NewFakeDockerClient().WithVersion("1.2.3", "1.2")
 	isp := newImageStatsProvider(fakeDockerClient)
 	st, err := isp.ImageStats()
 	as := assert.New(t)
@@ -34,7 +34,7 @@ func TestImageStatsNoImages(t *testing.T) {
 }
 
 func TestImageStatsWithImages(t *testing.T) {
-	fakeDockerClient := NewFakeDockerClientWithVersion("1.2.3", "1.2")
+	fakeDockerClient := NewFakeDockerClient().WithVersion("1.2.3", "1.2")
 	fakeHistoryData := map[string][]dockertypes.ImageHistory{
 		"busybox": {
 			{
@@ -317,7 +317,7 @@ func TestImageStatsWithCachedImages(t *testing.T) {
 			expectedTotalStorageSize: 600,
 		},
 	} {
-		fakeDockerClient := NewFakeDockerClientWithVersion("1.2.3", "1.2")
+		fakeDockerClient := NewFakeDockerClient().WithVersion("1.2.3", "1.2")
 		fakeDockerClient.InjectImages(test.images)
 		fakeDockerClient.InjectImageHistory(test.history)
 		isp := newImageStatsProvider(fakeDockerClient)