Merge pull request #17097 from rajatchopra/dockershim

Automatic merge from submit-queue. UPSTREAM: 47850: fix for bz1507257 hacked from upstream PR47850 'drop' these changes in favour of upstream PR47850 because this one does not carry the entire dependent chain. Conflicts were removed manually. Original commit comments by @dcbw: dockershim: checkpoint HostNetwork property To ensure kubelet doesn't attempt network teardown on HostNetwork containers that no longer exist but are still checkpointed, make sure we preserve the HostNetwork property in checkpoints. If the checkpoint indicates the container was a HostNetwork one, don't tear down the network since that would fail anyway. Related: kubernetes/kubernetes#44307 (comment)
openshift · Nov 1, 2017 · 92e746a · 92e746a
2 parents af9d638 + 794031b
commit 92e746a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/dockershim/docker_checkpoint.go b/vendor/k8s.io/kubernetes/pkg/kubelet/dockershim/docker_checkpoint.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/dockershim/docker_checkpoint_test.go b/vendor/k8s.io/kubernetes/pkg/kubelet/dockershim/docker_checkpoint_test.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/dockershim/docker_sandbox.go b/vendor/k8s.io/kubernetes/pkg/kubelet/dockershim/docker_sandbox.go