From 70cb04d9d875bdee89f283efc6acd3af973af5a0 Mon Sep 17 00:00:00 2001 From: Oleksandr Kozmenko <11qeq11@gmail.com> Date: Wed, 9 Sep 2026 01:16:33 +0300 Subject: [PATCH] fix: remove redundant cni dependency for flannel/kube-router/macvlan/multus (#12766) * fix: remove cni dependency for flannel Inspired by https://github.com/kubernetes-sigs/kubespray/pull/9563. * fix: remove cni dependency for kube-router/macvlan/multus It is not needed there since network_plugin meta already has it. For plugins which have reset tasks it is also breaking them since downloaded CNI archive is no longer present. --- roles/network_plugin/flannel/meta/main.yml | 3 --- roles/network_plugin/kube-router/meta/main.yml | 3 --- roles/network_plugin/macvlan/meta/main.yml | 3 --- roles/network_plugin/multus/meta/main.yml | 3 --- 4 files changed, 12 deletions(-) delete mode 100644 roles/network_plugin/flannel/meta/main.yml delete mode 100644 roles/network_plugin/kube-router/meta/main.yml delete mode 100644 roles/network_plugin/macvlan/meta/main.yml delete mode 100644 roles/network_plugin/multus/meta/main.yml diff --git a/roles/network_plugin/flannel/meta/main.yml b/roles/network_plugin/flannel/meta/main.yml deleted file mode 100644 index 9b7065f18..000000000 --- a/roles/network_plugin/flannel/meta/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -dependencies: - - role: network_plugin/cni diff --git a/roles/network_plugin/kube-router/meta/main.yml b/roles/network_plugin/kube-router/meta/main.yml deleted file mode 100644 index 9b7065f18..000000000 --- a/roles/network_plugin/kube-router/meta/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -dependencies: - - role: network_plugin/cni diff --git a/roles/network_plugin/macvlan/meta/main.yml b/roles/network_plugin/macvlan/meta/main.yml deleted file mode 100644 index 9b7065f18..000000000 --- a/roles/network_plugin/macvlan/meta/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -dependencies: - - role: network_plugin/cni diff --git a/roles/network_plugin/multus/meta/main.yml b/roles/network_plugin/multus/meta/main.yml deleted file mode 100644 index 9b7065f18..000000000 --- a/roles/network_plugin/multus/meta/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -dependencies: - - role: network_plugin/cni