mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-09-06 03:33:26 +00:00
show error when running dockershim
The error returned when running the dockershim is not checked. When running dockerless, we should show the existing error.
This commit is contained in:
@@ -316,7 +316,7 @@ func PreInitRuntimeService(kubeCfg *kubeletconfiginternal.KubeletConfiguration,
|
||||
|
||||
switch containerRuntime {
|
||||
case kubetypes.DockerContainerRuntime:
|
||||
runDockershim(
|
||||
if err := runDockershim(
|
||||
kubeCfg,
|
||||
kubeDeps,
|
||||
crOptions,
|
||||
@@ -324,7 +324,9 @@ func PreInitRuntimeService(kubeCfg *kubeletconfiginternal.KubeletConfiguration,
|
||||
remoteRuntimeEndpoint,
|
||||
remoteImageEndpoint,
|
||||
nonMasqueradeCIDR,
|
||||
)
|
||||
); err != nil {
|
||||
return err
|
||||
}
|
||||
case kubetypes.RemoteContainerRuntime:
|
||||
// No-op.
|
||||
break
|
||||
|
Reference in New Issue
Block a user