From e137649b369bcd6339e298fcbc0c0d248d5c0d68 Mon Sep 17 00:00:00 2001 From: Lantao Liu Date: Sat, 31 Mar 2018 00:39:20 +0000 Subject: [PATCH] Fix dockershim CreateContainer error handling. Signed-off-by: Lantao Liu --- pkg/kubelet/dockershim/docker_container.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkg/kubelet/dockershim/docker_container.go b/pkg/kubelet/dockershim/docker_container.go index acd5bf10ea8..6343e9be197 100644 --- 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 {