github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

show error when running dockershim

Browse Source 
The error returned when running the dockershim is not checked.
When running dockerless, we should show the existing error.
This commit is contained in:
Morgan Bauer 2020-06-09 23:26:18 -07:00
parent 875f31e988
commit 38a1d34401
No known key found for this signature in database
GPG Key ID: E825BB6045011EF1
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubelet/kubelet.go
View File

@ -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