Add kube-ipvs0/nodelocaldns to NetworkManager unmanaged-devices (#7315)

On CentOS 8 they seem to be ignored by default, but better be extra safe
This also make it easy to exclude other network plugin interfaces

Signed-off-by: Etienne Champetier <e.champetier@ateme.com>
(cherry picked from commit e442b1d2b9)
This commit is contained in:
Etienne Champetier
2021-03-03 10:27:20 -05:00
committed by Kubernetes Prow Robot
parent f26cc9f75b
commit 53b9388b82
7 changed files with 43 additions and 31 deletions

View File

@@ -25,9 +25,3 @@
until: crictl_calico_node_remove is succeeded
retries: 5
when: container_manager in ["crio", "containerd"]
- name: Calico | Reload NetworkManager
service:
name: NetworkManager
state: reloaded
when: '"running" in nm_check.stdout'

View File

@@ -6,29 +6,6 @@
mode: 0755
remote_src: yes
- name: Calico | Check if host has NetworkManager
# noqa 303 Should we use service_facts for this?
command: systemctl is-active --quiet NetworkManager.service
register: nm_check
failed_when: false
changed_when: false
- name: Calico | Ensure NetworkManager conf.d dir
file:
path: "/etc/NetworkManager/conf.d"
state: directory
recurse: yes
when: nm_check.rc == 0
- name: Calico | Prevent NetworkManager from managing Calico interfaces
copy:
content: |
[keyfile]
unmanaged-devices=interface-name:cali*;interface-name:tunl*;interface-name:vxlan.calico
dest: /etc/NetworkManager/conf.d/calico.conf
when: nm_check.rc == 0
notify: Calico | Reload NetworkManager
- name: Calico | Write Calico cni config
template:
src: "cni-calico.conflist.j2"