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

show error when running dockershim
This commit is contained in:
Kubernetes Prow Robot
2020-06-12 10:48:10 -07:00
committed by GitHub

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