revert v6

mikeeq · Jul 23, 2024 · 7b83842 · 7b83842
1 parent 4a183a6
commit 7b83842
Show file tree

Hide file tree

Showing 12 changed files with 6 additions and 31 deletions.
diff --git a/roles/apps/hadolint/defaults/main.yml b/roles/apps/hadolint/defaults/main.yml
diff --git a/roles/apps/hadolint/tasks/install.yml b/roles/apps/hadolint/tasks/install.yml
@@ -1,7 +1,7 @@
 ---
 - name: Download hadolint binary
   get_url:
-    url: "https://github.com/hadolint/hadolint/releases/download/v{{ hadolint_version }}/{{ package_name }}"
+    url: "https://github.com/hadolint/hadolint/releases/download/v{{ hadolint_version }}/hadolint-Linux-{{ hadolint_architecture_name }}"
     dest: "/usr/local/bin/hadolint"
     mode: 0755
     owner: root

diff --git a/roles/apps/hadolint/vars/aarch64.yml b/roles/apps/hadolint/vars/aarch64.yml
@@ -1,2 +1,2 @@
 ---
-package_architecture_name: "arm64"
+hadolint_architecture_name: "arm64"
diff --git a/roles/apps/hadolint/vars/x86_64.yml b/roles/apps/hadolint/vars/x86_64.yml
@@ -1,2 +1,2 @@
 ---
-package_architecture_name: "x86_64"
+hadolint_architecture_name: "x86_64"
diff --git a/roles/apps/helm/defaults/main.yml b/roles/apps/helm/defaults/main.yml
diff --git a/roles/apps/helm/tasks/install.yml b/roles/apps/helm/tasks/install.yml
@@ -1,7 +1,7 @@
 ---
 - name: Download helm archive
   get_url:
-    url: "https://get.helm.sh/{{ package_name }}"
+    url: "https://get.helm.sh/helm-v{{ helm_version }}-linux-{{ architecture_common_name }}.tar.gz"
     dest: /tmp/helm.tar.gz
 
 - name: Directory for helm

diff --git a/roles/apps/istioctl/defaults/main.yml b/roles/apps/istioctl/defaults/main.yml
diff --git a/roles/apps/istioctl/tasks/install.yml b/roles/apps/istioctl/tasks/install.yml
@@ -6,7 +6,7 @@
 
 - name: Download istioctl binary
   get_url:
-    url: "https://github.com/istio/istio/releases/download/{{ istioctl_version }}/{{ package_name }}"
+    url: "https://github.com/istio/istio/releases/download/{{ istioctl_version }}/istioctl-{{ istioctl_version }}-linux-{{ architecture_common_name }}.tar.gz"
     dest: /tmp/istioctl/istioctl.tar.gz
 
 - name: Unarchive a file that is already on the remote machine

diff --git a/roles/apps/kail/tasks/install.yml b/roles/apps/kail/tasks/install.yml
@@ -6,7 +6,7 @@
 
 - name: Download kail binary
   get_url:
-    url: "https://github.com/boz/kail/releases/download/v{{ kail_version }}/kail_v{{ kail_version }}_linux_{{ package_name }}.tar.gz"
+    url: "https://github.com/boz/kail/releases/download/v{{ kail_version }}/kail_v{{ kail_version }}_linux_{{ architecture_common_name }}.tar.gz"
     dest: /tmp/kail/kail.tar.gz
 
 - name: Unarchive a file that is already on the remote machine

diff --git a/roles/apps/kail/tasks/main.yml b/roles/apps/kail/tasks/main.yml
@@ -7,12 +7,6 @@
   changed_when: false
   ignore_errors: true
 
-- include_vars: x86_64.yml
-  when: ansible_architecture == "x86_64"
-
-- include_vars: arm64.yml
-  when: ansible_architecture == "aarch64"
-
 - name: "Installed version of kail:"
   debug:
     var: installed_kail_version.stdout

diff --git a/roles/apps/kail/vars/arm64.yml b/roles/apps/kail/vars/arm64.yml
diff --git a/roles/apps/kail/vars/x86_64.yml b/roles/apps/kail/vars/x86_64.yml