[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>

README.md

@@ -57,10 +57,10 @@ A simple way to ensure you get all the correct version of Ansible is to use the
 You will then need to use [bind mounts](https://docs.docker.com/storage/bind-mounts/) to get the inventory and ssh key into the container, like this:
 
 ```ShellSession
-docker pull quay.io/kubespray/kubespray:v2.19.1
+docker pull quay.io/kubespray/kubespray:v2.20.0
 docker run --rm -it --mount type=bind,source="$(pwd)"/inventory/sample,dst=/inventory \
   --mount type=bind,source="${HOME}"/.ssh/id_rsa,dst=/root/.ssh/id_rsa \
-  quay.io/kubespray/kubespray:v2.19.1 bash
+  quay.io/kubespray/kubespray:v2.20.0 bash
 # Inside the container you may now run the kubespray playbooks:
 ansible-playbook -i /inventory/inventory.ini --private-key /root/.ssh/id_rsa cluster.yml
 ```

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