Merge pull request #54888 from Cynerva/gkk/fix-iptables-conflict

Automatic merge from submit-queue (batch tested with PRs 54822, 53561, 54888). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Fix hook failure in kubernetes-worker charm due to iptables conflict **What this PR does / why we need it**: This fixes a hook failure that can occur on the kubernetes-worker charm due to iptable conflicts: ``` Another app is currently holding the xtables lock. Perhaps you want to use the -w option? ... subprocess.CalledProcessError: Command '['iptables', '-P', 'FORWARD', 'ACCEPT']' returned non-zero exit status 4 ``` **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: Passing `-w 300` to iptables tells it to wait up to 5 minutes to acquire the xtables lock, rather than aborting immediately. **Release note**: ```release-note NONE ```

Merge pull request #54888 from Cynerva/gkk/fix-iptables-conflict
741beb64 · Kubernetes Submit Queue · GitHub · e93b049b · 47f44f58 · 741beb64
Unverified Commit 741beb64 authored Nov 01, 2017 by Kubernetes Submit Queue Committed by GitHub Nov 01, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

kubernetes_worker.py ...ju/layers/kubernetes-worker/reactive/kubernetes_worker.py +1 -1

No files found.
--- a/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py
+++ b/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py
@@ -854,7 +854,7 @@ def fix_iptables_for_docker_1_13():
    https://github.com/kubernetes/kubernetes/issues/40182
    https://github.com/kubernetes/kubernetes/issues/39823
    """
-    cmd = ['iptables', '-P', 'FORWARD', 'ACCEPT']
+    cmd = ['iptables', '-w', '300', '-P', 'FORWARD', 'ACCEPT']
    check_call(cmd)