diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml index 2273e0156ae..4fecb377b42 100644 --- a/roles/download/defaults/main.yml +++ b/roles/download/defaults/main.yml @@ -66,7 +66,7 @@ quay_image_repo: "quay.io" # TODO(mattymo): Move calico versions to roles/network_plugins/calico/defaults # after migration to container download -calico_version: "v3.17.4" +calico_version: "v3.17.5" calico_ctl_version: "{{ calico_version }}" calico_cni_version: "{{ calico_version }}" calico_policy_version: "{{ calico_version }}" @@ -448,21 +448,25 @@ cni_binary_checksums: amd64: 962100bbc4baeaaa5748cdbfce941f756b1531c2eadb290129401498bfac21e7 calicoctl_binary_checksums: arm: - v3.18.3: 0 - v3.17.4: 0 - v3.16.10: 0 + v3.20.0: 0 + v3.19.2: 0 + v3.18.5: 0 + v3.17.5: 0 amd64: - v3.18.3: 03c31b84c99f03e2c5118985da502bd7c492461e8180e7cb00fb8a98fdd9aff3 - v3.17.4: dbd6e9d548577a8d940f353ac28100b6dc7471ccf099e6194fce733a153dfe45 - v3.16.10: 4078311aaf8c7efd642a82b1c3a8b7b9ef9a7eb0d94fc03f4dce88789e40e35b + v3.20.0: 5a1462e3d9c5bc3142b14788b5be427fae962863397a0176241afad02308f1a2 + v3.19.2: 33d5fe72c4ad1a0300b4a8f8cc22a78a281379dc9b7140d7dc6db4e3a0637da8 + v3.18.5: e5f810642c171dd80322529d1fda3eee6179010068d6c624ffad2c48311825ce + v3.17.5: aca1575872251dc7b5e0b9995055d6b5c8876584ffdd721a36ca4c830d26a313 arm64: - v3.18.3: 24e9f847a4b8677322c087e9ee878aa85700909a02629001d2fe48b37f48c65c - v3.17.4: 84595b2d154f65e64c1b7ce5cdb678400d4c1e1023dc1910b59b9aa2878d5b5b - v3.16.10: 1ccd3c2ab79eabbf6975edb92eab4ca516141e6fa4e76f1f7ed037dc53910b7e + v3.20.0: 9594125583723c9c631659ebfa00d76f66084a36af87eb08a388c1e614cfd741 + v3.19.2: 2ff17ea293d7637bcd58838380f4782842788191da1932d67400228af3314a69 + v3.18.5: 2080b2cd8efb71df98dce8678edaba8fce9252801c4b8f987609a4f4d6ddb4e2 + v3.17.5: 67f3e364b7d0467f8f63347d9f60d5649e65d4a2e606c30a531bad04a65e6ef4 calico_crds_archive_checksums: - v3.18.3: 6db4634d174167c85f4dfa5ce8607a8d8590625ddc3fd34a4ef5d8c7a94724de - v3.17.4: 92b9d37dcebe382a8e43d4384cfcceb5c9bc22459a2f8cdd89ab7c41b09a7532 - v3.16.10: a4627285afe5761a2681452bfcc858ec998ba2dae3060283b81b5ae3f7ea386b + v3.20.0: e85db5eb747c6647bdc7bbf09ed2a0fcfe7db86a5ce8b8bb8a9fba054ffb8b46 + v3.19.2: 2b5840530e10497f41901a1d5757feb3894fdfb3cad55e6d1352a370cd236ba3 + v3.18.5: ed7065c5a90b71cf7b3b525d5107a4573bd051c3ff004a56ab6017c222b3e2d6 + v3.17.5: 126dfbba4b90d72a19ccf61d9f2cbc31499cf98c95f12e2e5850e14b1e327741 krew_archive_checksums: v0.4.1: a26deea175f70264260d59a4e061778a892f8a8e301ac261660dd7d24c551c99 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 index f861d918d72..2c733723eba 100644 --- 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 index b696d6a956a..3e081398af6 100644 --- 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"