Skip to content

Commit a2f4601

Browse files
askervinklihub
authored andcommitted
e2e: fix CNI directory in recent containerd versions
Due to containerd configuration change in recent versions, that is switching from bin_dir to bin_dirs, our configuration modification for Fedora stopped working. This patch makes the CNI location fix more robust, and it works with old and new containerd versions. Signed-off-by: Antti Kervinen <[email protected]>
1 parent e0cf7ef commit a2f4601

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

test/e2e/playbook/provision.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -308,10 +308,10 @@
308308

309309
- name: Update CNI plugin directory on Fedora
310310
when: ansible_facts['distribution'] == "Fedora"
311-
ansible.builtin.lineinfile:
311+
ansible.builtin.replace:
312312
path: /etc/containerd/config.toml
313-
regexp: ' *bin_dir *= *./opt/cni/bin. *'
314-
line: 'bin_dir = "/usr/libexec/cni"'
313+
regexp: '/opt/cni/bin'
314+
replace: '/usr/libexec/cni'
315315

316316
- name: Configure bridge CNI plugin
317317
when: cni_plugin == "bridge"

0 commit comments

Comments
 (0)