Adding support for hybrid cluster (x86 nodes and RaspberryPI)

Makefile

@@ -1,10 +1,7 @@
 .EXPORT_ALL_VARIABLES:
 
-GPG_EMAIL=ricsanfre@gmail.com
-GPG_NAME=Ricardo Sanchez
-
 RUNNER=ansible-runner/ansible-runner.sh
-
+KUBECONFIG = $(shell pwd)/ansible-runner/runner/.kube/config
 
 .PHONY: default
 default: clean
@@ -41,7 +38,7 @@ gateway-setup:
 
 .PHONY: nodes-setup
 nodes-setup:
-	${RUNNER} ansible-playbook setup_picluster.yml --tags "nodes"
+	${RUNNER} ansible-playbook setup_picluster.yml --tags "node"
 
 .PHONY: external-services
 external-services:
@@ -86,3 +83,11 @@ shutdown-k3s-master:
 .PHONY: shutdown-gateway
 shutdown-gateway:
 	${RUNNER} ansible -b -m shell -a "shutdown -h 1 min" gateway
+
+.PHONY: get-argocd-passwd
+get-argocd-passwd:
+	kubectl get secret argocd-initial-admin-secret -o jsonpath='{.data.password}' -n argocd | base64 -d;echo
+
+.PHONY: get-elastic-passwd
+get-elastic-passwd:
+	kubectl get secret efk-es-elastic-user -o jsonpath='{.data.elastic}' -n logging | base64 -d;echo

ansible/backup_configuration.yml

@@ -1,7 +1,7 @@
 ---
 
 - name: Configure Pi-cluster nodes backup
-  hosts: raspberrypi
+  hosts: picluster:gateway
   gather_facts: true
   tags: [backup]
   become: true

ansible/inventory.yml

@@ -12,8 +12,6 @@ all:
           hostname: pimaster
           ansible_host: localhost
           ansible_connection: local
-          ip: 10.0.0.10
-          mac: 08:00:27:f3:6b:dd
     external:
       hosts:
         s3:
@@ -46,6 +44,11 @@ all:
           ansible_host: 10.0.0.15
           ip: 10.0.0.15
           mac: e4:5f:01:d9:ec:5c
+        khazad-dum:
+          hostname: khazad-dum
+          ansible-host: 10.0.0.20
+          ip: 10.0.0.20
+          mac: 18:60:24:21:1c:d4
     raspberrypi:
       hosts:
         node[1:5]:
@@ -58,3 +61,4 @@ all:
         k3s_worker:
           hosts:
             node[2:5]:
+            khazad-dum:

ansible/roles/basic_setup/tasks/disable_swap.yml

@@ -0,0 +1,11 @@
+---
+
+- name: System Configuration (2) | Disable swap at runtime
+  ansible.builtin.command: swapoff -a
+  when: ansible_swaptotal_mb > 0
+- name: System Configuration (2) | Disable swap at boot
+  ansible.posix.mount:
+    name: "{{ item }}"
+    fstype: swap
+    state: absent
+  loop: ["none", "swap"]

ansible/roles/basic_setup/tasks/main.yaml

@@ -14,31 +14,12 @@
   include_tasks: remove_snap.yaml
   when: "'snapd' in ansible_facts.packages"
 
+- name: Execute RaspberryPi specific setup tasks
+  include_tasks: raspberrypi_tasks.yml
+  when: "'raspberrypi' in group_names"
 
-- name: Install common packages
-  apt:
-    name: "{{ basic_packages }}"
-    update_cache: true
-    state: present
-
-- name: Copy utility scripts
-  copy:
-    src: "scripts/{{ item }}"
-    dest: "/usr/local/bin/{{ item }}"
-    owner: "root"
-    group: "root"
-    mode: "u=rwx,g=rx,o=rx"
-  with_items:
-    - pi_temp
-    - pi_throttling
-
-- name: Set GPU memory split to 16 MB
-  lineinfile:
-    path: /boot/firmware/config.txt
-    line: "gpu_mem=16"
-    create: true
-    mode: 0755
-  notify: reboot
+- name: Disable swap memory
+  include_tasks: disable_swap.yml
 
 - name: Blacklist storage devices in multipath configuration
   include_tasks: multipath_blacklist.yml

ansible/roles/basic_setup/tasks/raspberrypi_tasks.yml

@@ -0,0 +1,26 @@
+---
+
+- name: Install common packages
+  apt:
+    name: "{{ basic_packages }}"
+    update_cache: true
+    state: present
+
+- name: Copy utility scripts
+  copy:
+    src: "scripts/{{ item }}"
+    dest: "/usr/local/bin/{{ item }}"
+    owner: "root"
+    group: "root"
+    mode: "u=rwx,g=rx,o=rx"
+  with_items:
+    - pi_temp
+    - pi_throttling
+
+- name: Set GPU memory split to 16 MB
+  lineinfile:
+    path: /boot/firmware/config.txt
+    line: "gpu_mem=16"
+    create: true
+    mode: 0755
+  notify: reboot

ansible/roles/k3s/prereq/tasks/main.yml

@@ -36,11 +36,12 @@
     - net.bridge.bridge-nf-call-iptables
     - net.bridge.bridge-nf-call-ip6tables
 
-# Enable cgroups
+# Enable cgroups RaspberryPi
 - name: Enable cgroup via boot commandline if not already enabled for Ubuntu on a Raspberry Pi
   lineinfile:
     path: /boot/firmware/cmdline.txt
     backrefs: true
     regexp: '^((?!.*\bcgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory\b).*)$'
     line: '\1 cgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory'
+  when: "'raspberrypi' in group_names"
   notify: reboot

ansible/setup_picluster.yml

@@ -113,5 +113,6 @@
         - name: Configure Local Storage
           include_role:
             name: ricsanfre.storage
+          when: "'raspberrypi' in group_names"
       when: not centralized_san
       tags: [storage]

ansible/update.yml

@@ -1,5 +1,5 @@
 ---
-- hosts: raspberrypi
+- hosts: all
   become: true
   gather_facts: false