Skip to content

Commit b142f87

Browse files
Merge pull request #16602 from dcbw/dockershim-suppress-cni-errors
Automatic merge from submit-queue (batch tested with PRs 16525, 16602, 16603). UPSTREAM: 52864: dockershim: fine-tune network-ready handling on sandbox teardown and removal If sandbox teardown results in an error, GC will periodically attempt to again remove the sandbox. Until the sandbox is removed, pod sandbox status calls will attempt to enter the pod's namespace and retrieve the pod IP, but the first teardown attempt may have already removed the network namespace, resulting in a pointless log error message that the network namespace doesn't exist, or that nsenter can't find eth0. The network-ready mechanism originally attempted to suppress those messages by ensuring that pod sandbox status skipped network checks when networking was already torn down, but unfortunately the ready value was cleared too early. Also, don't tear down the pod network multiple times if the first time we tore it down, it succeeded. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1434950 @openshift/networking @eparis @knobunc
2 parents 0d882b8 + 1182948 commit b142f87

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

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

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

0 commit comments

Comments
 (0)