Skip to content

Commit

Permalink
Merge pull request kubernetes#46372 from cmluciano/cml/updateproxykub…
Browse files Browse the repository at this point in the history
…eadm

Automatic merge from submit-queue (batch tested with PRs 47084, 46016, 46372)

Enable iptables -w in kubeadm selfhosted

Currently containerized kube-proxy cannot support iptables -w
unless the xtables.lock is mounted.

Related: kubernetes#46103

Signed-off-by: Christopher M. Luciano <[email protected]>

**Special notes for your reviewer**:
- I need to figure out how to do some pre-setup to touch the file if it does not exist.
**Release note**:
```
support iptables -w in kubeadm containerized kube-proxy
```
  • Loading branch information
Kubernetes Submit Queue authored Jun 13, 2017
2 parents 03c5fd4 + 289c37a commit 0a1b7d9
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions cmd/kubeadm/app/phases/addons/manifests.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,15 @@ spec:
- /usr/local/bin/kube-proxy
- --kubeconfig=/var/lib/kube-proxy/kubeconfig.conf
{{ .ClusterCIDR }}
securityContext:
privileged: true
volumeMounts:
- mountPath: /var/lib/kube-proxy
name: kube-proxy
# TODO: Make this a file hostpath mount
- mountPath: /run/xtables.lock
name: xtables-lock
readOnly: false
securityContext:
privileged: true
hostNetwork: true
serviceAccountName: kube-proxy
# TODO: Why doesn't the Decoder recognize this new field and decode it properly? Right now it's ignored
Expand All @@ -87,6 +91,9 @@ spec:
- name: kube-proxy
configMap:
name: kube-proxy
- name: xtables-lock
hostPath:
path: /run/xtables.lock
`

KubeDNSVersion = "1.14.2"
Expand Down

0 comments on commit 0a1b7d9

Please sign in to comment.