diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml index 8c19688e9..1e479fa32 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.18.3" calico_ctl_version: "{{ calico_version }}" calico_cni_version: "{{ calico_version }}" calico_policy_version: "{{ calico_version }}" @@ -349,21 +349,21 @@ cni_binary_checksums: amd64: 962100bbc4baeaaa5748cdbfce941f756b1531c2eadb290129401498bfac21e7 calicoctl_binary_checksums: arm: + v3.19.1: 0 v3.18.3: 0 v3.17.4: 0 - v3.16.10: 0 amd64: + v3.19.1: e50980e9ceb6e3d37751cba2d871d76264c702c205824ae53584c97e2ad726fc v3.18.3: 03c31b84c99f03e2c5118985da502bd7c492461e8180e7cb00fb8a98fdd9aff3 v3.17.4: dbd6e9d548577a8d940f353ac28100b6dc7471ccf099e6194fce733a153dfe45 - v3.16.10: 4078311aaf8c7efd642a82b1c3a8b7b9ef9a7eb0d94fc03f4dce88789e40e35b arm64: + v3.19.1: 0bc3cb144deae5536065f48267ad80a340b917b9304bb20ef3ef64ef323372c0 v3.18.3: 24e9f847a4b8677322c087e9ee878aa85700909a02629001d2fe48b37f48c65c v3.17.4: 84595b2d154f65e64c1b7ce5cdb678400d4c1e1023dc1910b59b9aa2878d5b5b - v3.16.10: 1ccd3c2ab79eabbf6975edb92eab4ca516141e6fa4e76f1f7ed037dc53910b7e calico_crds_archive_checksums: + v3.19.1: 2a1b3f8933c9045d46f4c433224500ee67092844dee212e45482ea927694f0b3 v3.18.3: 6db4634d174167c85f4dfa5ce8607a8d8590625ddc3fd34a4ef5d8c7a94724de v3.17.4: 92b9d37dcebe382a8e43d4384cfcceb5c9bc22459a2f8cdd89ab7c41b09a7532 - v3.16.10: a4627285afe5761a2681452bfcc858ec998ba2dae3060283b81b5ae3f7ea386b 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 47c878d2e..c3686f7cd 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 b696d6a95..3e081398a 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"