Skip to content

Commit 92e746a

Browse files
openshift-merge-robotopenshift-merge-robot
authored
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)
2 parents af9d638 + 794031b commit 92e746a

File tree

3 files changed

+15
-8
lines changed

3 files changed

+15
-8
lines changed

‎vendor/k8s.io/kubernetes/pkg/kubelet/dockershim/docker_checkpoint.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/pkg/kubelet/dockershim/docker_checkpoint_test.go

Lines changed: 7 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/pkg/kubelet/dockershim/docker_sandbox.go

Lines changed: 7 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)