From 3b99d24ceb3a419e973a89b53b8141fe01d3520c Mon Sep 17 00:00:00 2001
From: Piotr Kowalczyk <7711184+wayfrro@users.noreply.github.com>
Date: Tue, 11 Oct 2022 04:45:01 +0200
Subject: [PATCH] Fix: install calico-kube-controller on kdd (#9358)
* 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
---
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
--
GitLab