Calico: add support for v3.19.1 (kubernetes-sigs#7630)

* Calico: add v3.19.1 hashes * enable liveness probe for calico-kube-controllers 3.19.1 * Calico: drop support for v3.16.x * Calico: promote v3.18.3 as default
notCalle · Dec 22, 2021 · 9716736 · 9716736
1 parent c3c0268
commit 9716736
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/roles/kubernetes-apps/policy_controller/calico/templates/calico-kube-controllers.yml.j2 b/roles/kubernetes-apps/policy_controller/calico/templates/calico-kube-controllers.yml.j2
@@ -40,11 +40,22 @@ 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:
+              - /usr/bin/check-status
+              - -l
+            periodSeconds: 10
+            initialDelaySeconds: 10
+            failureThreshold: 6
+{% endif %}
           readinessProbe:
             exec:
               command:
               - /usr/bin/check-status
               - -r
+            periodSeconds: 10
           env:
 {% if calico_datastore == "kdd" %}
             - name: ENABLED_CONTROLLERS

diff --git a/roles/network_plugin/calico/tasks/install.yml b/roles/network_plugin/calico/tasks/install.yml
@@ -112,16 +112,6 @@
     - enable_dual_stack_networks
 
 - block:
-    - name: Calico | Remove unwanted annotations and creationTimestamp keys from metadata in Calico manifests
-      # noqa 303 - sed avoids using nested loop
-      shell: >-
-        sed -E -i
-        -e '/^\s{2,4}creationTimestamp: null$/d'
-        -e '/^\s{2,4}annotations:/{:1;/\(devel\)$/!{N;b 1}; /.*/d}'
-        {{ local_release_dir }}/calico-{{ calico_version }}-kdd-crds/*.yaml
-      when:
-        - calico_version is version('v3.17.0', '<')
-
     - name: Calico | Create calico manifests for kdd
       assemble:
         src: "{{ local_release_dir }}/calico-{{ calico_version }}-kdd-crds"