node: use a warning instead of fatal when docker ping fails
@@ -20,6 +20,7 @@ import (
"k8s.io/kubernetes/pkg/kubelet/cadvisor"
cadvisortesting "k8s.io/kubernetes/pkg/kubelet/cadvisor/testing"
"k8s.io/kubernetes/pkg/kubelet/cm"
+ "k8s.io/kubernetes/pkg/util/mount"
"k8s.io/kubernetes/pkg/volume"
configapi "github.com/openshift/origin/pkg/cmd/server/api"
@@ -112,10 +113,20 @@ func (c *NodeConfig) EnsureDocker(docker *dockerutil.Helper) {
return
}
}
+ _, isFakeDocker := client.(*dockertools.FakeDockerClient)
+ if isFakeDocker {
+ // If using the fake docker client, ensure that the CgroupDriver for the kubelet matches
+ // the default cgroup driver, and use a fake mounter
+ c.KubeletServer.CgroupDriver = "cgroupfs"
+ c.KubeletDeps.Mounter = &mount.FakeMounter{}
+ }
+
+ if !isFakeDocker {
if err := dockerClient.Ping(); err != nil {
glog.Fatalf("Docker could not be reached at %s. Docker must be installed and running to start containers.\n%v", endpoint, err)
return
}
+ }
glog.Infof("Connecting to Docker at %s", endpoint)
