From f62cc81934634433eb8c7dbfc5bf755247a8efeb Mon Sep 17 00:00:00 2001 From: Yu-Ju Hong Date: Fri, 11 Jan 2019 10:21:38 -0800 Subject: [PATCH] Bump minimum docker version to 1.13.1 --- pkg/kubelet/cadvisor/testing/cadvisor_fake.go | 2 +- pkg/kubelet/dockershim/libdocker/client.go | 4 ++-- pkg/kubelet/dockershim/libdocker/fake_client.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/kubelet/cadvisor/testing/cadvisor_fake.go b/pkg/kubelet/cadvisor/testing/cadvisor_fake.go index 0fa6e278f5a..e773c8bba4c 100644 --- a/pkg/kubelet/cadvisor/testing/cadvisor_fake.go +++ b/pkg/kubelet/cadvisor/testing/cadvisor_fake.go @@ -33,7 +33,7 @@ const ( FakeMemoryCapacity = 4026531840 FakeKernelVersion = "3.16.0-0.bpo.4-amd64" FakeContainerOsVersion = "Debian GNU/Linux 7 (wheezy)" - FakeDockerVersion = "1.5.0" + FakeDockerVersion = "1.13.1" ) var _ cadvisor.Interface = new(Fake) diff --git a/pkg/kubelet/dockershim/libdocker/client.go b/pkg/kubelet/dockershim/libdocker/client.go index d43da1bd22e..db0b6a80001 100644 --- a/pkg/kubelet/dockershim/libdocker/client.go +++ b/pkg/kubelet/dockershim/libdocker/client.go @@ -28,8 +28,8 @@ import ( const ( // https://docs.docker.com/engine/reference/api/docker_remote_api/ - // docker version should be at least 1.11.x - MinimumDockerAPIVersion = "1.23.0" + // docker version should be at least 1.13.1 + MinimumDockerAPIVersion = "1.26.0" // Status of a container returned by ListContainers. StatusRunningPrefix = "Up" diff --git a/pkg/kubelet/dockershim/libdocker/fake_client.go b/pkg/kubelet/dockershim/libdocker/fake_client.go index 54dafcaf767..c176bf71392 100644 --- a/pkg/kubelet/dockershim/libdocker/fake_client.go +++ b/pkg/kubelet/dockershim/libdocker/fake_client.go @@ -81,7 +81,7 @@ type FakeDockerClient struct { const ( // Notice that if someday we also have minimum docker version requirement, this should also be updated. - fakeDockerVersion = "1.11.2" + fakeDockerVersion = "1.13.1" fakeImageSize = 1024