Skip to content

K
k3s
Unverified Commit 3533e8c0 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #63387 from feiskyer/automated-cherry-pick-of-#61965-upstream-release-1.10

Automatic merge from submit-queue. Automated cherry pick of #61965: Fix dockershim CreateContainer error handling. Cherry pick of #61965 on release-1.10. #61965: Fix dockershim CreateContainer error handling. ```release-note Fix dockershim CreateContainer error handling ```
parents 77611ae5 d719d73b
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
pkg/kubelet/dockershim/docker_container.go
View file @ 3533e8c0
...@@ -140,7 +140,10 @@ func (ds *dockerService) CreateContainer(_ context.Context, r *runtimeapi.Create ...@@ -140,7 +140,10 @@ func (ds *dockerService) CreateContainer(_ context.Context, r *runtimeapi.Create
} }
hc := createConfig.HostConfig 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. // Set devices for container.
devices := make([]dockercontainer.DeviceMapping, len(config.Devices)) devices := make([]dockercontainer.DeviceMapping, len(config.Devices))
for i, device := range config.Devices { for i, device := range config.Devices {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment