From 37a8caf2a53c0944ccdb2a0bfc72f53d3988673b Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Tue, 24 Jan 2017 16:57:31 +0100 Subject: [PATCH 1/2] pkg/kubelet/dockertools/docker_manager.go: remove unused errors. --- pkg/kubelet/dockertools/docker_manager.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkg/kubelet/dockertools/docker_manager.go b/pkg/kubelet/dockertools/docker_manager.go index 6f086a7e4af..626d9454f13 100644 --- a/pkg/kubelet/dockertools/docker_manager.go +++ b/pkg/kubelet/dockertools/docker_manager.go @@ -338,12 +338,6 @@ func GetContainerLogs(client DockerInterface, pod *v1.Pod, containerID kubeconta } var ( - // ErrNoContainersInPod is returned when there are no containers for a given pod - ErrNoContainersInPod = errors.New("NoContainersInPod") - - // ErrNoPodInfraContainerInPod is returned when there is no pod infra container for a given pod - ErrNoPodInfraContainerInPod = errors.New("NoPodInfraContainerInPod") - // ErrContainerCannotRun is returned when a container is created, but cannot run properly ErrContainerCannotRun = errors.New("ContainerCannotRun") ) From c52d367ecdd89e3f97d7e784c69070fbb704b3b5 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Tue, 24 Jan 2017 16:58:30 +0100 Subject: [PATCH 2/2] pkg/kubelet/dockertools/docker_manager.go: remove unused const. --- pkg/kubelet/dockertools/docker_manager.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/kubelet/dockertools/docker_manager.go b/pkg/kubelet/dockertools/docker_manager.go index 626d9454f13..c7bfdb0ad18 100644 --- a/pkg/kubelet/dockertools/docker_manager.go +++ b/pkg/kubelet/dockertools/docker_manager.go @@ -86,7 +86,6 @@ const ( // Remote API version for docker daemon versions // https://docs.docker.com/engine/reference/api/docker_remote_api/ dockerV110APIVersion = "1.22" - DockerV112APIVersion = "1.24" // ndots specifies the minimum number of dots that a domain name must contain for the resolver to consider it as FQDN (fully-qualified) // we want to able to consider SRV lookup names like _dns._udp.kube-dns.default.svc to be considered relative.