mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 11:50:44 +00:00
Merge pull request #53093 from MrHohn/kube-proxy-mount-lock
Automatic merge from submit-queue (batch tested with PRs 50280, 52529, 53093, 53108, 53168). 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>. Remove touch-lock init container from kube-proxy **What this PR does / why we need it**: Ack https://github.com/kubernetes/kubeadm/issues/298, touch-lock init container is no longer needed after we have https://github.com/kubernetes/kubernetes/pull/46597. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #NONE **Special notes for your reviewer**: /assign @bowei @cmluciano cc @dixudx **Release note**: ```release-note NONE ```
This commit is contained in:
commit
c98dfbfaeb
@ -28,16 +28,6 @@ spec:
|
||||
hostNetwork: true
|
||||
nodeSelector:
|
||||
beta.kubernetes.io/kube-proxy-ds-ready: "true"
|
||||
initContainers:
|
||||
- name: touch-lock
|
||||
image: busybox
|
||||
command: ['/bin/touch', '/run/xtables.lock']
|
||||
securityContext:
|
||||
privileged: true
|
||||
volumeMounts:
|
||||
- mountPath: /run
|
||||
name: run
|
||||
readOnly: false
|
||||
containers:
|
||||
- name: kube-proxy
|
||||
image: {{pillar['kube_docker_registry']}}/kube-proxy:{{pillar['kube-proxy_docker_tag']}}
|
||||
@ -73,7 +63,5 @@ spec:
|
||||
- name: xtables-lock
|
||||
hostPath:
|
||||
path: /run/xtables.lock
|
||||
- name: run
|
||||
hostPath:
|
||||
path: /run
|
||||
type: FileOrCreate
|
||||
serviceAccountName: kube-proxy
|
||||
|
@ -65,16 +65,6 @@ metadata:
|
||||
spec:
|
||||
{{pod_priority}}
|
||||
hostNetwork: true
|
||||
initContainers:
|
||||
- name: touch-lock
|
||||
image: busybox
|
||||
command: ['/bin/touch', '/run/xtables.lock']
|
||||
securityContext:
|
||||
privileged: true
|
||||
volumeMounts:
|
||||
- mountPath: /run
|
||||
name: run
|
||||
readOnly: false
|
||||
containers:
|
||||
- name: kube-proxy
|
||||
image: {{pillar['kube_docker_registry']}}/kube-proxy:{{pillar['kube-proxy_docker_tag']}}
|
||||
@ -120,9 +110,6 @@ spec:
|
||||
- hostPath:
|
||||
path: /var/log
|
||||
name: varlog
|
||||
- hostPath:
|
||||
path: /run
|
||||
name: run
|
||||
- hostPath:
|
||||
path: /run/xtables.lock
|
||||
type: FileOrCreate
|
||||
|
Loading…
Reference in New Issue
Block a user