revert v6 - more

playbooks/fedora.yml

@@ -2,32 +2,32 @@
 - name: Include a playbook for including arch specifc vars
   import_playbook: vars.yml
 
-- name: Fedora bootstrap
-  hosts:
-    - "{{ hosts_to_deploy | default('local') }}"
-    # - mikeeClevo
-  become: true
-  pre_tasks:
-    # - debug:
-    #     var: hostvars[inventory_hostname]
-  roles:
-    - pkg_mgmt/dnf
-    - pkg_mgmt/flatpak
-    - desktop/apps/google_chrome
-    - desktop/apps/keeweb
-    - apps/docker
-    - apps/qemu
-    - desktop/apps/terminator
-    - apps/vagrant
-    - apps/packer
-    - desktop/gnome
-    - desktop/apps/vscode
-    - desktop/apps/x11docker
-    - desktop/fedora
-    # - apps/nordvpn
+# - name: Fedora bootstrap
+#   hosts:
+#     - "{{ hosts_to_deploy | default('local') }}"
+#     # - mikeeClevo
+#   become: true
+#   pre_tasks:
+#     # - debug:
+#     #     var: hostvars[inventory_hostname]
+#   roles:
+#     - pkg_mgmt/dnf
+#     - pkg_mgmt/flatpak
+#     - desktop/apps/google_chrome
+#     - desktop/apps/keeweb
+#     - apps/docker
+#     - apps/qemu
+#     - desktop/apps/terminator
+#     - apps/vagrant
+#     - apps/packer
+#     - desktop/gnome
+#     - desktop/apps/vscode
+#     - desktop/apps/x11docker
+#     - desktop/fedora
+#     # - apps/nordvpn
 
-- name: Include a playbook for generic-core provisioning
-  import_playbook: generic-core.yml
+# - name: Include a playbook for generic-core provisioning
+#   import_playbook: generic-core.yml
 
 - name: Include a playbook for generic provisioning
   import_playbook: generic.yml

playbooks/generic.yml

@@ -3,16 +3,16 @@
   hosts: "{{ hosts_to_deploy | default('local') }}"
   become: true
   roles:
-    - pkg_mgmt/pip
-    # - apps/keybase
-    - apps/kubectl
-    - apps/helm
+    # - pkg_mgmt/pip
+    # # - apps/keybase
+    # - apps/kubectl
+    # - apps/helm
     - apps/stern
     - apps/kail
-    - apps/hadolint
+    # - apps/hadolint
     - apps/kubescore
-    - apps/istioctl
-    - apps/netcore_sdk
+    # - apps/istioctl
+    # - apps/netcore_sdk
     - apps/argocd
     - apps/aws-cli
     - apps/terraform

roles/apps/argocd/tasks/install.yml

@@ -1,7 +1,7 @@
 ---
 - name: Download argocd binary
   get_url:
-    url: "https://github.com/argoproj/argo-cd/releases/download/v{{ argocd_version }}/{{ package_name }}"
+    url: "https://github.com/argoproj/argo-cd/releases/download/v{{ argocd_version }}/argocd-linux-{{ architecture_common_name }}"
     dest: "/usr/local/bin/argocd"
     mode: 0755
     owner: root

roles/apps/ctop/tasks/install.yml

@@ -1,7 +1,7 @@
 ---
 - name: Download ctop
   get_url:
-    url: "https://github.com/bcicen/ctop/releases/download/v{{ ctop_version }}/{{ package_name }}"
+    url: "https://github.com/bcicen/ctop/releases/download/v{{ ctop_version }}/ctop-{{ ctop_version }}-linux-{{ architecture_common_name }}"
     dest: /usr/local/bin/ctop
     force: true
     mode: 0755

roles/apps/dive/tasks/install.yml

@@ -6,7 +6,7 @@
 
 - name: Download dive binary
   get_url:
-    url: "https://github.com/wagoodman/dive/releases/download/v{{ dive_version }}/{{ package_name }}"
+    url: "https://github.com/wagoodman/dive/releases/download/v{{ dive_version }}/dive_{{ dive_version }}_linux_{{ architecture_common_name }}.tar.gz"
     dest: /tmp/dive/dive.tar.gz
 
 - name: Unarchive a file that is already on the remote machine

roles/apps/docker-compose/tasks/install.yml

@@ -1,7 +1,7 @@
 ---
 - name: Download docker_compose binary
   get_url:
-    url: "https://github.com/docker/compose/releases/download/v{{ docker_compose_version }}/{{ package_name }}"
+    url: "https://github.com/docker/compose/releases/download/v{{ docker_compose_version }}/docker-compose-linux-{{ ansible_architecture }}"
     dest: "/usr/local/bin/docker-compose"
     mode: 0755
     owner: root

roles/apps/docker/tasks/main.yml

@@ -8,12 +8,6 @@
 #   ansible.builtin.debug:
 #     var: ansible_facts.services
 
-- include_vars: x86_64.yml
-  when: ansible_architecture == "x86_64"
-
-- include_vars: arm64.yml
-  when: ansible_architecture == "aarch64"
-
 - name: Disable and stop firewalld
   ansible.builtin.service:
     name: firewalld

roles/apps/hadolint/defaults/main.yml

@@ -0,0 +1,2 @@
+---
+package_name: "hadolint-Linux-{{ package_architecture_name }}"

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 }}/hadolint-Linux-x86_64"
+    url: "https://github.com/hadolint/hadolint/releases/download/v{{ hadolint_version }}/{{ package_name }}"
     dest: "/usr/local/bin/hadolint"
     mode: 0755
     owner: root

roles/apps/hadolint/tasks/main.yml

@@ -7,11 +7,7 @@
   changed_when: false
   ignore_errors: true
 
-- include_vars: x86_64.yml
-  when: ansible_architecture == "x86_64"
-
-- include_vars: arm64.yml
-  when: ansible_architecture == "aarch64"
+- include_vars: "{{ ansible_architecture }}.yml"
 
 - name: "Installed version of hadolint:"
   debug:

roles/apps/hadolint/vars/aarch64.yml

@@ -0,0 +1,2 @@
+---
+package_architecture_name: "arm64"

roles/apps/hadolint/vars/x86_64.yml

@@ -1,7 +1,2 @@
 ---
-package_name: "amd64"
-
-# https://github.com/ishantanu/awesome-kubectl-plugins
-krew_plugins:
-  - sniff
-  - hns
+package_architecture_name: "x86_64"

roles/apps/helm/defaults/main.yml

@@ -0,0 +1,2 @@
+---
+package_name: "helm-v{{ helm_version }}-linux-{{ architecture_common_name }}.tar.gz"

roles/apps/helm/tasks/install.yml

@@ -1,7 +1,7 @@
 ---
 - name: Download helm archive
   get_url:
-    url: "https://get.helm.sh/helm-v{{ helm_version }}-linux-{{ package_name }}.tar.gz"
+    url: "https://get.helm.sh/{{ package_name }}"
     dest: /tmp/helm.tar.gz
 
 - name: Directory for helm

roles/apps/helm/tasks/main.yml

@@ -5,12 +5,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 helm:"
   debug:
     var: installed_helm_version.stdout

roles/apps/istioctl/defaults/main.yml

@@ -0,0 +1,2 @@
+---
+package_name: "istioctl-{{ istioctl_version }}-linux-{{ architecture_common_name }}.tar.gz"

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 }}/istioctl-{{ istioctl_version }}-linux-{{ package_name }}.tar.gz"
+    url: "https://github.com/istio/istio/releases/download/{{ istioctl_version }}/{{ package_name }}"
     dest: /tmp/istioctl/istioctl.tar.gz
 
 - name: Unarchive a file that is already on the remote machine

roles/apps/istioctl/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 istioctl:"
   debug:
     var: installed_istioctl_version.stdout

roles/apps/kubectl/tasks/krew/install.yml

@@ -6,7 +6,7 @@
 
 - name: Download krew binary
   get_url:
-    url: "https://github.com/kubernetes-sigs/krew/releases/download/v{{ krew_version }}/krew-linux_{{ package_name }}.tar.gz"
+    url: "https://github.com/kubernetes-sigs/krew/releases/download/v{{ krew_version }}/krew-linux_{{ architecture_common_name }}.tar.gz"
     dest: /tmp/krew/krew.tar.gz
 
 - name: Download krew config

roles/apps/kubectl/tasks/main.yml

@@ -5,12 +5,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 kubectl:"
   debug:
     var: installed_kubectl_version.stdout
@@ -20,7 +14,7 @@
 
 - name: Download kubectl
   get_url:
-    url: "https://storage.googleapis.com/kubernetes-release/release/v{{ kubectl_version }}/bin/linux/{{ package_name }}/kubectl"
+    url: "https://storage.googleapis.com/kubernetes-release/release/v{{ kubectl_version }}/bin/linux/{{ architecture_common_name }}/kubectl"
     dest: /usr/local/bin/kubectl
     force: true
   when: installed_kubectl_version.stdout != kubectl_version

roles/apps/kubescore/tasks/install.yml

@@ -6,7 +6,7 @@
 
 - name: Download kubescore binary
   get_url:
-    url: "https://github.com/zegl/kube-score/releases/download/v{{ kubescore_version }}/kube-score_{{ kubescore_version }}_linux_{{ package_name }}.tar.gz"
+    url: "https://github.com/zegl/kube-score/releases/download/v{{ kubescore_version }}/kube-score_{{ kubescore_version }}_linux_{{ architecture_common_name }}.tar.gz"
     dest: /tmp/kubescore/kubescore.tar.gz
 
 - name: Unarchive a file that is already on the remote machine

roles/apps/kubescore/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 kubescore:"
   debug:
     var: installed_kubescore_version.stdout