diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml index 337ec361c..54702d6ad 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.16.9" +calico_version: "v3.17.3" calico_ctl_version: "{{ calico_version }}" calico_cni_version: "{{ calico_version }}" calico_policy_version: "{{ calico_version }}" @@ -318,15 +318,23 @@ cni_binary_checksums: amd64: 58a58d389895ba9f9bbd3ef330f186c0bb7484136d0bfb9b50152eed55d9ec24 calicoctl_binary_checksums: arm: + v3.18.1: 0 + v3.17.3: 0 v3.16.9: 0 v3.15.2: 0 amd64: + v3.18.1: 29d0dc67458c1fb8950b5c157de41045d4f502eb80791d7858c7a6252c2390c1 + v3.17.3: c9ce1358694c251ef5f4d65e60255dc8d1376bb13c73a42a61085a2dc435465b v3.16.9: 3858748e3446f24f6176ef4125fa58bb6f934f6e838cf92f60eafee6aa8117e5 v3.15.2: 219ae954501cbe15daeda0ad52e13ec65f99c77548c7d3cbfc4ced5c7149fdf1 arm64: + v3.18.1: 2ba81451db3ef49708e2344f318fe60662bd344f91fd1a85ce1c5e8cffa830fb + v3.17.3: 773288bb8d4580bd7a248e05bdd7140693a4ab3c29b1930f02c2e77189356034 v3.16.9: beac9a1ac66fbed05000901aa883443397f05e0f6ffe10ceeccf89f427edc8ad v3.15.2: 49165f9e4ad55402248b578310fcf68a57363f54e66be04ac24be9714899b4d5 calico_crds_archive_checksums: + v3.18.1: 4702a887db9014d1c208a4969e1a72e38803d757c2656d3e64376b96e4897556 + v3.17.3: ce3c74e20af86912e3116dcd995667b636178b091b0f890060eab4e9a4d50bd7 v3.16.9: cc33648e3fffd973c8780f49589b1ecf57487f8693cfd12a335dcd2a606784c0 v3.15.2: 82e7122ec04a89c89861b8377c39ae357c7cdbbf60b5f0f1b8fc18ba6bda7dc2 diff --git a/roles/network_plugin/calico/tasks/install.yml b/roles/network_plugin/calico/tasks/install.yml index cb35f31f0..fd4926266 100644 --- a/roles/network_plugin/calico/tasks/install.yml +++ b/roles/network_plugin/calico/tasks/install.yml @@ -125,6 +125,7 @@ assemble: src: "{{ local_release_dir }}/calico-{{ calico_version }}-kdd-crds" dest: "{{ kube_config_dir }}/kdd-crds.yml" + delimiter: "---\n" regexp: ".*\\.yaml" remote_src: true