epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-28 09:39:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

[calico] clean up workarounds for older versions

Browse Source
This commit is contained in:
Calin Cristian Andrei
2022-06-11 18:57:09 +03:00
committed by Kubernetes Prow Robot
parent 9efe145688
commit 2de5c4821c
7 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/kubernetes-apps/policy_controller/calico/templates/calico-kube-controllers.yml.j2
View File

@@ -40,7 +40,6 @@ spec:
requests:
cpu: {{ calico_policy_controller_cpu_requests }}
memory: {{ calico_policy_controller_memory_requests }}
{% if calico_version is version('v3.19.0', '>=') %}
livenessProbe:
exec:
command:
@@ -49,7 +48,6 @@ spec:
periodSeconds: 10
initialDelaySeconds: 10
failureThreshold: 6
{% endif %}
readinessProbe:
exec:
command:

4
roles/kubernetes-apps/policy_controller/meta/main.yml
View File

@@ -4,13 +4,13 @@ dependencies:
when:
- kube_network_plugin == 'calico'
- enable_network_policy
- calico_datastore != "kdd" or calico_policy_version is version('v3.6.0', '>=')
- calico_datastore != "kdd"
tags:
- policy-controller
- role: policy_controller/calico
when:
- kube_network_plugin == 'canal'
- calico_datastore != "kdd" or calico_policy_version is version('v3.6.0', '>=')
- calico_datastore != "kdd"
tags:
- policy-controller