File tree 1 file changed +14
-3
lines changed
pkg/cmd/server/kubernetes/node
1 file changed +14
-3
lines changed Original file line number Diff line number Diff line change @@ -20,6 +20,7 @@ import (
20
20
"k8s.io/kubernetes/pkg/kubelet/cadvisor"
21
21
cadvisortesting "k8s.io/kubernetes/pkg/kubelet/cadvisor/testing"
22
22
"k8s.io/kubernetes/pkg/kubelet/cm"
23
+ "k8s.io/kubernetes/pkg/util/mount"
23
24
"k8s.io/kubernetes/pkg/volume"
24
25
25
26
configapi "github.com/openshift/origin/pkg/cmd/server/api"
@@ -112,9 +113,19 @@ func (c *NodeConfig) EnsureDocker(docker *dockerutil.Helper) {
112
113
return
113
114
}
114
115
}
115
- if err := dockerClient .Ping (); err != nil {
116
- glog .Fatalf ("Docker could not be reached at %s. Docker must be installed and running to start containers.\n %v" , endpoint , err )
117
- return
116
+ _ , isFakeDocker := client .(* dockertools.FakeDockerClient )
117
+ if isFakeDocker {
118
+ // If using the fake docker client, ensure that the CgroupDriver for the kubelet matches
119
+ // the default cgroup driver, and use a fake mounter
120
+ c .KubeletServer .CgroupDriver = "cgroupfs"
121
+ c .KubeletDeps .Mounter = & mount.FakeMounter {}
122
+ }
123
+
124
+ if ! isFakeDocker {
125
+ if err := dockerClient .Ping (); err != nil {
126
+ glog .Fatalf ("Docker could not be reached at %s. Docker must be installed and running to start containers.\n %v" , endpoint , err )
127
+ return
128
+ }
118
129
}
119
130
120
131
glog .Infof ("Connecting to Docker at %s" , endpoint )
You can’t perform that action at this time.
0 commit comments