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

Merge pull request #91789 from MHBauer/raise-dockershim-error

Browse Source 
show error when running dockershim
This commit is contained in:
Kubernetes Prow Robot 2020-06-12 10:48:10 -07:00 committed by GitHub
commit 0adf8a48e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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