mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 20:24:09 +00:00
Merge pull request #91789 from MHBauer/raise-dockershim-error
show error when running dockershim
This commit is contained in:
commit
0adf8a48e0
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user