Merge pull request #19576 from dcbw/dockershim-SetUpPod-cleanup-on-fa…

…ilure UPSTREAM: 62874: dockershim/sandbox: clean up pod network even if SetUpPod() failed
openshift · May 6, 2018 · a2f5c9e · a2f5c9e
2 parents 4644e40 + 08bdb94
commit a2f5c9e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/dockershim/docker_sandbox.go b/vendor/k8s.io/kubernetes/pkg/kubelet/dockershim/docker_sandbox.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/dockershim/docker_sandbox_test.go b/vendor/k8s.io/kubernetes/pkg/kubelet/dockershim/docker_sandbox_test.go