Remove touch-lock init container from kube-proxy

This commit is contained in:
Zihong Zheng 2017-09-26 17:53:19 -07:00
parent 30f015a6fc
commit 1c85a63366
2 changed files with 1 additions and 26 deletions

View File

@ -28,16 +28,6 @@ spec:
hostNetwork: true hostNetwork: true
nodeSelector: nodeSelector:
beta.kubernetes.io/kube-proxy-ds-ready: "true" 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: containers:
- name: kube-proxy - name: kube-proxy
image: {{pillar['kube_docker_registry']}}/kube-proxy:{{pillar['kube-proxy_docker_tag']}} image: {{pillar['kube_docker_registry']}}/kube-proxy:{{pillar['kube-proxy_docker_tag']}}
@ -73,7 +63,5 @@ spec:
- name: xtables-lock - name: xtables-lock
hostPath: hostPath:
path: /run/xtables.lock path: /run/xtables.lock
- name: run type: FileOrCreate
hostPath:
path: /run
serviceAccountName: kube-proxy serviceAccountName: kube-proxy

View File

@ -65,16 +65,6 @@ metadata:
spec: spec:
{{pod_priority}} {{pod_priority}}
hostNetwork: true 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: containers:
- name: kube-proxy - name: kube-proxy
image: {{pillar['kube_docker_registry']}}/kube-proxy:{{pillar['kube-proxy_docker_tag']}} image: {{pillar['kube_docker_registry']}}/kube-proxy:{{pillar['kube-proxy_docker_tag']}}
@ -120,9 +110,6 @@ spec:
- hostPath: - hostPath:
path: /var/log path: /var/log
name: varlog name: varlog
- hostPath:
path: /run
name: run
- hostPath: - hostPath:
path: /run/xtables.lock path: /run/xtables.lock
type: FileOrCreate type: FileOrCreate