From 38a1d344019ff1e1a5f8fd7680947a3513359c16 Mon Sep 17 00:00:00 2001
From: Morgan Bauer <mbauer@us.ibm.com>
Date: Tue, 9 Jun 2020 23:26:18 -0700
Subject: [PATCH] show error when running dockershim

The error returned when running the dockershim is not checked.
When running dockerless, we should show the existing error.
---
 pkg/kubelet/kubelet.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go
index 2a5619d3b19..c9668fa04ce 100644
--- a/pkg/kubelet/kubelet.go
+++ b/pkg/kubelet/kubelet.go
@@ -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