Merge pull request #18919 from danwinship/fix-iptables-restore-wait

Automatic merge from submit-queue (batch tested with PRs 18908, 18919). UPSTREAM: 60978: Fix use of "-w" flag to iptables-restore iptables-restore's option-parsing code is weird and broken, and it requires you to say "-w 5" rather than "-w5". Up until now we've never been running OpenShift against a version of iptables new enough to have that flag, so we didn't notice, but 1.6.2 is now in updates-testing in Fedora 27, and when it hits updates, it will totally break kube-proxy in docker-in-docker. (For master/3.9; older releases still use F25 so won't ever see iptables 1.6.2.)
openshift · Mar 9, 2018 · 9c581ab · 9c581ab
2 parents 7136332 + 67a7671
commit 9c581ab
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 22 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/util/iptables/iptables.go b/vendor/k8s.io/kubernetes/pkg/util/iptables/iptables.go
diff --git a/vendor/k8s.io/kubernetes/pkg/util/iptables/iptables_test.go b/vendor/k8s.io/kubernetes/pkg/util/iptables/iptables_test.go