Fix dockershim CreateContainer error handling.

Signed-off-by: Lantao Liu <lantaol@google.com>

Fix dockershim CreateContainer error handling.
e137649b · Lantao Liu · 35386768 · e137649b
Commit e137649b authored Mar 31, 2018 by Lantao Liu
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

docker_container.go pkg/kubelet/dockershim/docker_container.go +4 -1

No files found.
--- a/pkg/kubelet/dockershim/docker_container.go
+++ b/pkg/kubelet/dockershim/docker_container.go
@@ -140,7 +140,10 @@ func (ds *dockerService) CreateContainer(_ context.Context, r *runtimeapi.Create
 	}

 	hc := createConfig.HostConfig
-	ds.updateCreateConfig(&createConfig, config, sandboxConfig, podSandboxID, securityOptSeparator, apiVersion)
+	err = ds.updateCreateConfig(&createConfig, config, sandboxConfig, podSandboxID, securityOptSeparator, apiVersion)
+	if err != nil {
+		return nil, fmt.Errorf("failed to update container create config: %v", err)
+	}
 	// Set devices for container.
 	devices := make([]dockercontainer.DeviceMapping, len(config.Devices))
 	for i, device := range config.Devices {