Skip to content

Commit 4393e56

Browse files
Merge pull request #16328 from danwinship/udp-service-conntrack
Automatic merge from submit-queue (batch tested with PRs 15725, 16244, 15796, 16328, 16334) Fix UDP service blackhole problem when number of endpoints changes from 0 to non-0 When a UDP service goes from 0 endpoints to 1, we need to run "conntrack -D ..." in case there are cached conntrack entries from pods hitting the "-j REJECT" iptables rule that gets installed for services with no endpoints. Additionally, we need to make sure that OpenShift nodes have conntrack-tools installed so that they can actually run /sbin/conntrack in this and other cases. (There are additional bugs open about fixing the official images.) Upstream: kubernetes/kubernetes#48524 Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1487438
2 parents 6af6cb2 + 2722efa commit 4393e56

File tree

4 files changed

+190
-102
lines changed

4 files changed

+190
-102
lines changed

images/dind/node/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ RUN dnf -y update && dnf -y install\
2121
bridge-utils\
2222
ethtool\
2323
iptables-services\
24+
conntrack-tools\
2425
openvswitch\
2526
python-netaddr\
2627
python2-pyroute2\

origin.spec

+1
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ Requires: socat
121121
Requires: nfs-utils
122122
Requires: ethtool
123123
Requires: device-mapper-persistent-data >= 0.6.2
124+
Requires: conntrack-tools
124125
Requires(post): systemd
125126
Requires(preun): systemd
126127
Requires(postun): systemd

vendor/k8s.io/kubernetes/pkg/proxy/iptables/proxier.go

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

0 commit comments

Comments
 (0)