Browse Source

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

canal should mount xtables.lock to share the lock with other processe…
pull/3198/head
k8s-ci-robot 6 years ago
committed by GitHub
parent
commit
a247c2c713
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
  1. 7
      roles/network_plugin/canal/templates/canal-node.yaml.j2

7
roles/network_plugin/canal/templates/canal-node.yaml.j2

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

Loading…
Cancel
Save