From c553912f939c9425c3c12e78f200ef721cf6738a Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Tue, 8 Nov 2022 07:12:17 +0800 Subject: [PATCH] [2.20] Fix: install calico-kube-controller on kdd (#9358) (#9470) * Fix: install policy controller on kdd too * Remove the calico_policy_version condition altogether * Install policy controller both on canal and calico under same condition Co-authored-by: Piotr Kowalczyk <7711184+wayfrro@users.noreply.github.com> --- roles/kubernetes-apps/policy_controller/meta/main.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/roles/kubernetes-apps/policy_controller/meta/main.yml b/roles/kubernetes-apps/policy_controller/meta/main.yml index a1050cc19..3f46b8d58 100644 --- a/roles/kubernetes-apps/policy_controller/meta/main.yml +++ b/roles/kubernetes-apps/policy_controller/meta/main.yml @@ -2,15 +2,7 @@ dependencies: - role: policy_controller/calico when: - - kube_network_plugin == 'calico' + - kube_network_plugin in ['calico', 'canal'] - enable_network_policy - - calico_datastore != "kdd" - tags: - - policy-controller - - - role: policy_controller/calico - when: - - kube_network_plugin == 'canal' - - calico_datastore != "kdd" tags: - policy-controller