-
Notifications
You must be signed in to change notification settings - Fork 4.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
UPSTREAM: 47850: fix for bz1507257 hacked from upstream PR47850 #17097
Conversation
…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)
/retest |
@rajatchopra I think the title should be 'UPSTREAM: 47850: fix for bz1507257 hacked from upstream PR47850' |
@openshift/networking PTAL |
/kind bug |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm...
Conflicts were removed manually.
What conflicted? It looks like this PR is basically identical to the upstream commit...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/lgtm
ready status is checked using getNetworkReady(podSandboxID) today, but its not used upstream. Conflict here. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/approve
/test |
/assign @derekwaynecarr |
/retest |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: eparis, knobunc, pecameron, rajatchopra The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these OWNERS Files:
You can indicate your approval by writing |
Automatic merge from submit-queue. |
my team is hitting this issue. Besides filling up the logs very quickly, are these error messages benign? |
This might fix the issue temporarily, run this on each fault node: for name in $(ls | grep -v `ls /var/lib/docker/containers/ | paste -sd “|” -`); do rm -f /var/lib/dockershim/$name; done |
@shah-zobair |
@ustm Fixed that, cannot use code block for those backticks in command. |
'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)