Commit 04a02a6

openshift-merge-robot

authored

Merge pull request #17222 from knobunc/fix/increase-iptables-wait

Automatic merge from submit-queue. UPSTREAM: 55248: increase iptables max wait from 2 seconds to 5 (fix) There were a few more places that had a different form of the wait argument. This catches those places and makes them use the same constant. https://bugzilla.redhat.com/show_bug.cgi?id=1506396 Upstream PR kubernetes/kubernetes#55248

2 parents a133c41 + c4de29c commit 04a02a6Copy full SHA for 04a02a6

2 files changed

+4

-4

lines changed

vendor/k8s.io/kubernetes/pkg/util/iptables
- iptables.go
- iptables_test.go

2 files changed

+4

-4

lines changed

`‎vendor/k8s.io/kubernetes/pkg/util/iptables/iptables.go`

+1-1

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

`‎vendor/k8s.io/kubernetes/pkg/util/iptables/iptables_test.go`

+3-3

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

Comments

(0)