github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-15 14:14:39 +00:00
Code Issues Projects Releases Wiki Activity

Use existing method to get Docker version.

Browse Source
This commit is contained in:
Wojciech Tyczynski
2015-02-04 20:50:21 +01:00
parent 78f66a6ce9
commit ead67108ce
6 changed files with 35 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/kubelet/dockertools/docker.go
View File

@@ -104,7 +104,7 @@ type dockerContainerCommandRunner struct {
var dockerAPIVersionWithExec = []uint{1, 15}
// Returns the major and minor version numbers of docker server.
func (d *dockerContainerCommandRunner) getDockerServerVersion() ([]uint, error) {
func (d *dockerContainerCommandRunner) GetDockerServerVersion() ([]uint, error) {
env, err := d.client.Version()
if err != nil {
return nil, fmt.Errorf("failed to get docker server version - %v", err)
@@ -127,7 +127,7 @@ func (d *dockerContainerCommandRunner) getDockerServerVersion() ([]uint, error)
}
func (d *dockerContainerCommandRunner) nativeExecSupportExists() (bool, error) {
version, err := d.getDockerServerVersion()
version, err := d.GetDockerServerVersion()
if err != nil {
return false, err
}
@@ -626,4 +626,5 @@ func parseImageName(image string) (string, string) {
type ContainerCommandRunner interface {
RunInContainer(containerID string, cmd []string) ([]byte, error)
GetDockerServerVersion() ([]uint, error)
}

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

@@ -123,7 +123,7 @@ func TestContainerManifestNaming(t *testing.T) {
func TestGetDockerServerVersion(t *testing.T) {
fakeDocker := &FakeDockerClient{VersionInfo: docker.Env{"Client version=1.2", "Server version=1.1.3", "Server API version=1.15"}}
runner := dockerContainerCommandRunner{fakeDocker}
version, err := runner.getDockerServerVersion()
version, err := runner.GetDockerServerVersion()
if err != nil {
t.Errorf("got error while getting docker server version - %s", err)
}