From 010b71a5f7b229bcdd02ff4e262b153564bbf305 Mon Sep 17 00:00:00 2001 From: Andy Goldstein Date: Wed, 5 Apr 2017 16:01:19 -0400 Subject: [PATCH] kubelet: make dockershim.sock configurable Make the location of dockershim.sock configurable, so downstream projects (such as OpenShift) can place it in a location that does not require root access (e.g. for integration tests). Make the kubelet respect and use the values of --container-runtime-endpoint and --image-service-endpoint, if set. If unset, the default value of /var/run/dockershim.sock is used. --- pkg/kubelet/kubelet.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index 57b5668235..6ea11f7633 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -568,10 +568,15 @@ func NewMainKubelet(kubeCfg *componentconfig.KubeletConfiguration, kubeDeps *Kub // The unix socket for kubelet <-> dockershim communication. ep = "/var/run/dockershim.sock" ) - kubeCfg.RemoteRuntimeEndpoint, kubeCfg.RemoteImageEndpoint = ep, ep + if len(kubeCfg.RemoteRuntimeEndpoint) == 0 { + kubeCfg.RemoteRuntimeEndpoint = ep + } + if len(kubeCfg.RemoteImageEndpoint) == 0 { + kubeCfg.RemoteImageEndpoint = ep + } glog.V(2).Infof("Starting the GRPC server for the docker CRI shim.") - server := dockerremote.NewDockerServer(ep, ds) + server := dockerremote.NewDockerServer(kubeCfg.RemoteRuntimeEndpoint, ds) if err := server.Start(); err != nil { return nil, err }