From 2403ca3693c68dd3a9ce44e559437c6972ec4bc3 Mon Sep 17 00:00:00 2001 From: sarendsen Date: Tue, 18 Oct 2022 11:28:17 +0200 Subject: [PATCH 1/3] Add architecture to checksum files --- tasks/cni.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tasks/cni.yml b/tasks/cni.yml index c3d9741b..f6fe85ac 100644 --- a/tasks/cni.yml +++ b/tasks/cni.yml @@ -10,7 +10,7 @@ - name: Check CNI package checksum file stat: - path: "{{ role_path }}/files/nomad_cni_{{ nomad_cni_version }}_SHA256SUMS" + path: "{{ role_path }}/files/cni-plugins-linux-{{nomad_architecture}}-v{{ nomad_cni_version }}.sha256" become: false run_once: true tags: installation @@ -20,7 +20,7 @@ - name: Get Nomad CNI package checksum file get_url: url: "{{ nomad_cni_checksum_file_url }}" - dest: "{{ role_path }}/files/nomad_cni_{{ nomad_cni_version }}_SHA256SUMS" + dest: "{{ role_path }}/files/cni-plugins-linux-{{nomad_architecture}}-v{{ nomad_cni_version }}.sha256" become: false run_once: true tags: installation @@ -30,7 +30,7 @@ - name: Get Nomad CNI package checksum shell: | set -o pipefail - grep "{{ nomad_cni_pkg }}" "{{ role_path }}/files/nomad_cni_{{ nomad_cni_version }}_SHA256SUMS" | awk '{print $1}' + grep "{{ nomad_cni_pkg }}" "{{ role_path }}/files/cni-plugins-linux-{{nomad_architecture}}-v{{ nomad_cni_version }}.sha256" | awk '{print $1}' args: executable: /bin/bash become: false From 1d78ddf9c5aaf78dfc5f9783caf6b1bf6bd9d472 Mon Sep 17 00:00:00 2001 From: sarendsen Date: Thu, 20 Oct 2022 10:44:57 +0200 Subject: [PATCH 2/3] Make it a variable --- defaults/main.yml | 1 + tasks/cni.yml | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 94de4e5f..a91efce8 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -212,4 +212,5 @@ nomad_cni_version: "{{ lookup('env','NOMAD_CNI_VERSION') | default('0.9.1', true nomad_cni_pkg: "cni-plugins-linux-{{nomad_architecture}}-v{{ nomad_cni_version }}.tgz" nomad_cni_url: "https://github.com/containernetworking/plugins/releases/download/v{{ nomad_cni_version }}" nomad_cni_zip_url: "{{ nomad_cni_url }}/{{ nomad_cni_pkg }}" +nomad_cni_checksum_file: "{{ nomad_cni_pkg }}.sha256" nomad_cni_checksum_file_url: "{{ nomad_cni_zip_url }}.sha256" diff --git a/tasks/cni.yml b/tasks/cni.yml index f6fe85ac..6497ccd9 100644 --- a/tasks/cni.yml +++ b/tasks/cni.yml @@ -10,7 +10,7 @@ - name: Check CNI package checksum file stat: - path: "{{ role_path }}/files/cni-plugins-linux-{{nomad_architecture}}-v{{ nomad_cni_version }}.sha256" + path: "{{ role_path }}/files/{{ nomad_cni_checksum_file }}" become: false run_once: true tags: installation @@ -20,7 +20,7 @@ - name: Get Nomad CNI package checksum file get_url: url: "{{ nomad_cni_checksum_file_url }}" - dest: "{{ role_path }}/files/cni-plugins-linux-{{nomad_architecture}}-v{{ nomad_cni_version }}.sha256" + dest: "{{ role_path }}/files/{{ nomad_cni_checksum_file }}" become: false run_once: true tags: installation @@ -30,7 +30,7 @@ - name: Get Nomad CNI package checksum shell: | set -o pipefail - grep "{{ nomad_cni_pkg }}" "{{ role_path }}/files/cni-plugins-linux-{{nomad_architecture}}-v{{ nomad_cni_version }}.sha256" | awk '{print $1}' + grep "{{ nomad_cni_pkg }}" "{{ role_path }}/files/{{ nomad_cni_checksum_file }}" | awk '{print $1}' args: executable: /bin/bash become: false From 719b423f9d2cbef0511852df35d5ad0457fc5ca4 Mon Sep 17 00:00:00 2001 From: sarendsen Date: Thu, 20 Oct 2022 11:24:05 +0200 Subject: [PATCH 3/3] Make it a variable --- defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defaults/main.yml b/defaults/main.yml index a91efce8..aac2eee7 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -213,4 +213,4 @@ nomad_cni_pkg: "cni-plugins-linux-{{nomad_architecture}}-v{{ nomad_cni_version } nomad_cni_url: "https://github.com/containernetworking/plugins/releases/download/v{{ nomad_cni_version }}" nomad_cni_zip_url: "{{ nomad_cni_url }}/{{ nomad_cni_pkg }}" nomad_cni_checksum_file: "{{ nomad_cni_pkg }}.sha256" -nomad_cni_checksum_file_url: "{{ nomad_cni_zip_url }}.sha256" +nomad_cni_checksum_file_url: "{{ nomad_cni_url }}/{{ nomad_cni_checksum_file }}" \ No newline at end of file