From 0afaeab9b1cd37a45e595996cbda070f63ddc6f3 Mon Sep 17 00:00:00 2001 From: Michael Taufen Date: Fri, 12 Aug 2016 09:56:50 -0700 Subject: [PATCH] Only try to connect to docker if we're actually using the docker runtime --- cmd/kubelet/app/server.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go index d117cf97ad1..a3e9fa17bc9 100644 --- a/cmd/kubelet/app/server.go +++ b/cmd/kubelet/app/server.go @@ -124,12 +124,19 @@ func UnsecuredKubeletDeps(s *options.KubeletServer) (*kubelet.KubeletDeps, error writer = &kubeio.NsenterWriter{} } + var dockerClient dockertools.DockerInterface + if s.ContainerRuntime == "docker" { + dockerClient = dockertools.ConnectToDockerOrDie(s.DockerEndpoint, s.RuntimeRequestTimeout.Duration) + } else { + dockerClient = nil + } + return &kubelet.KubeletDeps{ Auth: nil, // default does not enforce auth[nz] CAdvisorInterface: nil, // cadvisor.New launches background processes (bg http.ListenAndServe, and some bg cleaners), not set here Cloud: nil, // cloud provider might start background processes ContainerManager: nil, - DockerClient: dockertools.ConnectToDockerOrDie(s.DockerEndpoint, s.RuntimeRequestTimeout.Duration), // TODO(random-liu): Set RuntimeRequestTimeout for rkt. + DockerClient: dockerClient, KubeClient: nil, Mounter: mounter, NetworkPlugins: ProbeNetworkPlugins(s.NetworkPluginDir),