Skip to content

Commit 794031b

Browse files
dcbwRajat Chopra
dcbw
authored and
Rajat Chopra
committed
UPSTREAM: drop: fix for bz1507257 hacked from upstream PR47850, drop these changes in favour of that PR because this one does not carry the entire dependent chain. Conflicts were removed manually.
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)
1 parent c4d53a2 commit 794031b

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

+1
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

+7-2
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

+7-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)