From d0d62c485239d3b053ba74cebdd604cea410bb9e Mon Sep 17 00:00:00 2001 From: Cesar Wong Date: Wed, 22 Mar 2017 15:28:50 -0400 Subject: [PATCH] UPSTREAM: 43460: Remove unused DockerManager daemon version [1.5] --- .../pkg/kubelet/dockertools/docker_manager.go | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/dockertools/docker_manager.go b/vendor/k8s.io/kubernetes/pkg/kubelet/dockertools/docker_manager.go index b4ca95e86aec..6433de76febf 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/dockertools/docker_manager.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/dockertools/docker_manager.go @@ -1795,8 +1795,7 @@ func (dm *DockerManager) calculateOomScoreAdj(pod *api.Pod, container *api.Conta // versionInfo wraps api version and daemon version. type versionInfo struct { - apiVersion kubecontainer.Version - daemonVersion kubecontainer.Version + apiVersion kubecontainer.Version } // checkDockerAPIVersion checks current docker API version against expected version. @@ -2634,19 +2633,14 @@ func (dm *DockerManager) GetPodStatus(uid kubetypes.UID, name, namespace string) return podStatus, nil } -// getVersionInfo returns apiVersion & daemonVersion of docker runtime +// getVersionInfo returns apiVersion of docker runtime func (dm *DockerManager) getVersionInfo() (versionInfo, error) { apiVersion, err := dm.APIVersion() if err != nil { return versionInfo{}, err } - daemonVersion, err := dm.Version() - if err != nil { - return versionInfo{}, err - } return versionInfo{ - apiVersion: apiVersion, - daemonVersion: daemonVersion, + apiVersion: apiVersion, }, nil }