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

View File

@ -316,7 +316,7 @@ func PreInitRuntimeService(kubeCfg *kubeletconfiginternal.KubeletConfiguration,
switch containerRuntime { switch containerRuntime {
case kubetypes.DockerContainerRuntime: case kubetypes.DockerContainerRuntime:
runDockershim( if err := runDockershim(
kubeCfg, kubeCfg,
kubeDeps, kubeDeps,
crOptions, crOptions,
@ -324,7 +324,9 @@ func PreInitRuntimeService(kubeCfg *kubeletconfiginternal.KubeletConfiguration,
remoteRuntimeEndpoint, remoteRuntimeEndpoint,
remoteImageEndpoint, remoteImageEndpoint,
nonMasqueradeCIDR, nonMasqueradeCIDR,
) ); err != nil {
return err
}
case kubetypes.RemoteContainerRuntime: case kubetypes.RemoteContainerRuntime:
// No-op. // No-op.
break break