Skip to content

Commit

Permalink
Merge pull request #16328 from danwinship/udp-service-conntrack
Browse files Browse the repository at this point in the history
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
  • Loading branch information
openshift-merge-robot committed Sep 15, 2017
2 parents 6af6cb2 + 2722efa commit 4393e56
Show file tree
Hide file tree
Showing 4 changed files with 190 additions and 102 deletions.
1 change: 1 addition & 0 deletions images/dind/node/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ RUN dnf -y update && dnf -y install\
bridge-utils\
ethtool\
iptables-services\
conntrack-tools\
openvswitch\
python-netaddr\
python2-pyroute2\
Expand Down
1 change: 1 addition & 0 deletions origin.spec
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ Requires: socat
Requires: nfs-utils
Requires: ethtool
Requires: device-mapper-persistent-data >= 0.6.2
Requires: conntrack-tools
Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
Expand Down
67 changes: 47 additions & 20 deletions vendor/k8s.io/kubernetes/pkg/proxy/iptables/proxier.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 4393e56

Please sign in to comment.