From 8a654b6955714e67e53e703758c8738605884ffd Mon Sep 17 00:00:00 2001
From: ERIK <bo.jiang@daocloud.io>
Date: Wed, 9 Nov 2022 09:46:13 +0800
Subject: [PATCH] Add cni bin when installing calico (#9367)
Signed-off-by: bo.jiang <bo.jiang@daocloud.io>
Signed-off-by: bo.jiang <bo.jiang@daocloud.io>
---
roles/network_plugin/meta/main.yml | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/roles/network_plugin/meta/main.yml b/roles/network_plugin/meta/main.yml
index 49143874d..cb013fcca 100644
--- a/roles/network_plugin/meta/main.yml
+++ b/roles/network_plugin/meta/main.yml
@@ -1,5 +1,7 @@
---
dependencies:
+ - role: network_plugin/cni
+
- role: network_plugin/cilium
when: kube_network_plugin == 'cilium' or cilium_deploy_additionally | default(false) | bool
tags:
@@ -25,11 +27,6 @@ dependencies:
tags:
- canal
- - role: network_plugin/cni
- when: kube_network_plugin in ['cni', 'cloud']
- tags:
- - cni
-
- role: network_plugin/macvlan
when: kube_network_plugin == 'macvlan'
tags:
--
GitLab