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
2022-10-11 04:45:01 +02:00 · 2022-10-11 04:45:01 +02:00 · 3b99d24ceb
parent 4701abff4c
commit 3b99d24ceb
1 changed files with 1 additions and 9 deletions
--- 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