Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
f62cc819
Commit
f62cc819
authored
Jan 11, 2019
by
Yu-Ju Hong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bump minimum docker version to 1.13.1
parent
a7cb03f4
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
cadvisor_fake.go
pkg/kubelet/cadvisor/testing/cadvisor_fake.go
+1
-1
client.go
pkg/kubelet/dockershim/libdocker/client.go
+2
-2
fake_client.go
pkg/kubelet/dockershim/libdocker/fake_client.go
+1
-1
No files found.
pkg/kubelet/cadvisor/testing/cadvisor_fake.go
View file @
f62cc819
...
@@ -33,7 +33,7 @@ const (
...
@@ -33,7 +33,7 @@ const (
FakeMemoryCapacity
=
4026531840
FakeMemoryCapacity
=
4026531840
FakeKernelVersion
=
"3.16.0-0.bpo.4-amd64"
FakeKernelVersion
=
"3.16.0-0.bpo.4-amd64"
FakeContainerOsVersion
=
"Debian GNU/Linux 7 (wheezy)"
FakeContainerOsVersion
=
"Debian GNU/Linux 7 (wheezy)"
FakeDockerVersion
=
"1.
5.0
"
FakeDockerVersion
=
"1.
13.1
"
)
)
var
_
cadvisor
.
Interface
=
new
(
Fake
)
var
_
cadvisor
.
Interface
=
new
(
Fake
)
...
...
pkg/kubelet/dockershim/libdocker/client.go
View file @
f62cc819
...
@@ -28,8 +28,8 @@ import (
...
@@ -28,8 +28,8 @@ import (
const
(
const
(
// https://docs.docker.com/engine/reference/api/docker_remote_api/
// https://docs.docker.com/engine/reference/api/docker_remote_api/
// docker version should be at least 1.1
1.x
// docker version should be at least 1.1
3.1
MinimumDockerAPIVersion
=
"1.2
3
.0"
MinimumDockerAPIVersion
=
"1.2
6
.0"
// Status of a container returned by ListContainers.
// Status of a container returned by ListContainers.
StatusRunningPrefix
=
"Up"
StatusRunningPrefix
=
"Up"
...
...
pkg/kubelet/dockershim/libdocker/fake_client.go
View file @
f62cc819
...
@@ -81,7 +81,7 @@ type FakeDockerClient struct {
...
@@ -81,7 +81,7 @@ type FakeDockerClient struct {
const
(
const
(
// Notice that if someday we also have minimum docker version requirement, this should also be updated.
// Notice that if someday we also have minimum docker version requirement, this should also be updated.
fakeDockerVersion
=
"1.1
1.2
"
fakeDockerVersion
=
"1.1
3.1
"
fakeImageSize
=
1024
fakeImageSize
=
1024
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment