Merge pull request #3191 from fcgravalos/make-canal-mount-xtables-lock

canal should mount xtables.lock to share the lock with other processe…
This commit is contained in:
k8s-ci-robot 2018-08-29 08:57:32 -07:00 committed by GitHub
commit a247c2c713
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -51,6 +51,10 @@ spec:
- name: "canal-certs" - name: "canal-certs"
hostPath: hostPath:
path: "{{ canal_cert_dir }}" path: "{{ canal_cert_dir }}"
- name: xtables-lock
hostPath:
path: /run/xtables.lock
type: FileOrCreate
containers: containers:
# Runs the flannel daemon to enable vxlan networking between # Runs the flannel daemon to enable vxlan networking between
# container hosts. # container hosts.
@ -128,6 +132,9 @@ spec:
- name: "canal-certs" - name: "canal-certs"
mountPath: "{{ canal_cert_dir }}" mountPath: "{{ canal_cert_dir }}"
readOnly: true readOnly: true
- name: xtables-lock
mountPath: /run/xtables.lock
readOnly: false
# Runs calico/node container on each Kubernetes node. This # Runs calico/node container on each Kubernetes node. This
# container programs network policy and local routes on each # container programs network policy and local routes on each
# host. # host.