mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 03:41:45 +00:00
Merge pull request #47598 from luxas/kubeadm_fix_proxy
Automatic merge from submit-queue (batch tested with PRs 47451, 47410, 47598, 47616, 47473) kubeadm: Fix kube-proxy regression caused by #46372 **What this PR does / why we need it**: Fixes: https://github.com/kubernetes/kubeadm/issues/306 **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: Required for kubeadm v1.7 to work **Release note**: ```release-note NONE ``` @kubernetes/sig-cluster-lifecycle-pr-reviews @cmluciano
This commit is contained in:
commit
7ad835d74b
@ -72,6 +72,8 @@ 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
|
||||
@ -79,8 +81,6 @@ spec:
|
||||
- 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
|
||||
|
Loading…
Reference in New Issue
Block a user