Skip to content

Commit

Permalink
node: use a warning instead of fatal when docker ping fails
Browse files Browse the repository at this point in the history
  • Loading branch information
csrwng committed Jan 4, 2018
1 parent 188906e commit ca5ca9c
Showing 1 changed file with 14 additions and 3 deletions.
17 changes: 14 additions & 3 deletions pkg/cmd/server/kubernetes/node/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -112,9 +113,19 @@ func (c *NodeConfig) EnsureDocker(docker *dockerutil.Helper) {
return
}
}
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
_, 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)
Expand Down

0 comments on commit ca5ca9c

Please sign in to comment.