Skip to content

Commit 38a1d34

Browse files
committed
show error when running dockershim
The error returned when running the dockershim is not checked. When running dockerless, we should show the existing error.
1 parent 875f31e commit 38a1d34

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

pkg/kubelet/kubelet.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -316,15 +316,17 @@ func PreInitRuntimeService(kubeCfg *kubeletconfiginternal.KubeletConfiguration,
316316

317317
switch containerRuntime {
318318
case kubetypes.DockerContainerRuntime:
319-
runDockershim(
319+
if err := runDockershim(
320320
kubeCfg,
321321
kubeDeps,
322322
crOptions,
323323
runtimeCgroups,
324324
remoteRuntimeEndpoint,
325325
remoteImageEndpoint,
326326
nonMasqueradeCIDR,
327-
)
327+
); err != nil {
328+
return err
329+
}
328330
case kubetypes.RemoteContainerRuntime:
329331
// No-op.
330332
break

0 commit comments

Comments
 (0)