From 2fbbb70baad50840db6330c2db4eac681ae94c6a Mon Sep 17 00:00:00 2001 From: ERIK Date: Tue, 8 Aug 2023 21:12:15 +0800 Subject: [PATCH] Fix youki binary download url (#10337) Signed-off-by: bo.jiang --- roles/container-engine/youki/tasks/main.yml | 2 +- roles/download/defaults/main/checksums.yml | 48 ++++++++++----------- roles/download/defaults/main/main.yml | 4 +- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/roles/container-engine/youki/tasks/main.yml b/roles/container-engine/youki/tasks/main.yml index d617963df..e88f663e3 100644 --- a/roles/container-engine/youki/tasks/main.yml +++ b/roles/container-engine/youki/tasks/main.yml @@ -6,7 +6,7 @@ - name: Youki | Copy youki binary from download dir copy: - src: "{{ local_release_dir }}/youki_v{{ youki_version | regex_replace('\\.', '_') }}_linux/youki-v{{ youki_version }}/youki" + src: "{{ local_release_dir }}/youki_{{ youki_version | regex_replace('\\.', '_') }}_linux/youki-{{ youki_version }}/youki" dest: "{{ youki_bin_dir }}/youki" mode: 0755 remote_src: true diff --git a/roles/download/defaults/main/checksums.yml b/roles/download/defaults/main/checksums.yml index 61585edd5..d6459c101 100644 --- a/roles/download/defaults/main/checksums.yml +++ b/roles/download/defaults/main/checksums.yml @@ -792,33 +792,33 @@ crun_checksums: 1.7.1: 0 youki_checksums: arm: - v0.1.0: 0 - v0.0.5: 0 - v0.0.4: 0 - v0.0.3: 0 - v0.0.2: 0 - v0.0.1: 0 + 0.1.0: 0 + 0.0.5: 0 + 0.0.4: 0 + 0.0.3: 0 + 0.0.2: 0 + 0.0.1: 0 arm64: - v0.1.0: 0 - v0.0.5: 0 - v0.0.4: 0 - v0.0.3: 0 - v0.0.2: 0 - v0.0.1: 0 + 0.1.0: 0 + 0.0.5: 0 + 0.0.4: 0 + 0.0.3: 0 + 0.0.2: 0 + 0.0.1: 0 amd64: - v0.1.0: f00677e9674215b44f140f0c0f4b79b0001c72c073d2c5bb514b7a9dcb13bdbc - v0.0.5: 8504f4c35a24b96782b9e0feb7813aba4e7262c55a39b8368e94c80c9a4ec564 - v0.0.4: c213376393cb16462ef56586e68fef9ec5b5dd80787e7152f911d7cfd72d952e - v0.0.3: 15df10c78f6a35e45a1dce92c827d91b9aef22dc926c619ff5befafc8543f1bb - v0.0.2: dd61f1c3af204ec8a29a52792897ca0d0f21dca0b0ec44a16d84511a19e4a569 - v0.0.1: 8bd712fe95c8a81194bfbc54c70516350f95153d67044579af95788fbafd943b + 0.1.0: f00677e9674215b44f140f0c0f4b79b0001c72c073d2c5bb514b7a9dcb13bdbc + 0.0.5: 8504f4c35a24b96782b9e0feb7813aba4e7262c55a39b8368e94c80c9a4ec564 + 0.0.4: c213376393cb16462ef56586e68fef9ec5b5dd80787e7152f911d7cfd72d952e + 0.0.3: 15df10c78f6a35e45a1dce92c827d91b9aef22dc926c619ff5befafc8543f1bb + 0.0.2: dd61f1c3af204ec8a29a52792897ca0d0f21dca0b0ec44a16d84511a19e4a569 + 0.0.1: 8bd712fe95c8a81194bfbc54c70516350f95153d67044579af95788fbafd943b ppc64le: - v0.1.0: 0 - v0.0.5: 0 - v0.0.4: 0 - v0.0.3: 0 - v0.0.2: 0 - v0.0.1: 0 + 0.1.0: 0 + 0.0.5: 0 + 0.0.4: 0 + 0.0.3: 0 + 0.0.2: 0 + 0.0.1: 0 kata_containers_binary_checksums: arm: 3.1.3: 0 diff --git a/roles/download/defaults/main/main.yml b/roles/download/defaults/main/main.yml index 3a8ec8c75..223a23b92 100644 --- a/roles/download/defaults/main/main.yml +++ b/roles/download/defaults/main/main.yml @@ -80,7 +80,7 @@ kubeadm_version: "{{ kube_version }}" crun_version: 1.8.5 runc_version: v1.1.7 kata_containers_version: 3.1.3 -youki_version: v0.1.0 +youki_version: 0.1.0 gvisor_version: 20230627 containerd_version: 1.7.2 cri_dockerd_version: 0.3.4 @@ -169,7 +169,7 @@ crio_download_url: "https://storage.googleapis.com/cri-o/artifacts/cri-o.{{ imag helm_download_url: "https://get.helm.sh/helm-{{ helm_version }}-linux-{{ image_arch }}.tar.gz" runc_download_url: "https://github.com/opencontainers/runc/releases/download/{{ runc_version }}/runc.{{ image_arch }}" crun_download_url: "https://github.com/containers/crun/releases/download/{{ crun_version }}/crun-{{ crun_version }}-linux-{{ image_arch }}" -youki_download_url: "https://github.com/containers/youki/releases/download/{{ youki_version }}/youki_{{ youki_version | regex_replace('\\.', '_') }}_linux.tar.gz" +youki_download_url: "https://github.com/containers/youki/releases/download/v{{ youki_version }}/youki_{{ youki_version | regex_replace('\\.', '_') }}_linux.tar.gz" kata_containers_download_url: "https://github.com/kata-containers/kata-containers/releases/download/{{ kata_containers_version }}/kata-static-{{ kata_containers_version }}-{{ ansible_architecture }}.tar.xz" # gVisor only supports amd64 and uses x86_64 to in the download link gvisor_runsc_download_url: "https://storage.googleapis.com/gvisor/releases/release/{{ gvisor_version }}/{{ ansible_architecture }}/runsc"