From 3f378c1d8e84bb7e53cb24415fdc01749f542b62 Mon Sep 17 00:00:00 2001
From: savagebidoof <filter.oriol@gmail.com>
Date: Thu, 14 Dec 2023 02:45:28 +0100
Subject: [PATCH] Insignificant changes.

Added install for `nfs-common` package, required for NFS mounting.
---
 Initial_Setup/armbian_initial_setup.yaml |  2 --
 README.md                                |  4 ++++
 ksetup/playbook.yaml                     |  1 +
 ksetup/tasks_prepare_node.yaml           | 14 ++++++++------
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/Initial_Setup/armbian_initial_setup.yaml b/Initial_Setup/armbian_initial_setup.yaml
index d115e5d..1da049b 100644
--- a/Initial_Setup/armbian_initial_setup.yaml
+++ b/Initial_Setup/armbian_initial_setup.yaml
@@ -18,8 +18,6 @@
     new_user_password: "my_password"
     new_root_password: "my_root_password"
 
-    ansible_python_interpreter: "/usr/bin/python3"
-
     ## Locales
     new_locale: "en_US.UTF-8"
     new_language: "en_US.UTF-8"
diff --git a/README.md b/README.md
index e0843ba..980b9a4 100644
--- a/README.md
+++ b/README.md
@@ -141,6 +141,10 @@ _kubeadm_join_command: Placeholder, will be populated at later stages of the scr
 
 # USAGE
 
+## Update Calico/MetalLB versions
+
+Open the file `tasks_master.yaml` and update the .yaml files for Calico and MetalLB to match the desired/newer versions.
+
 ## Setup
 
 On my infrastructure/environment, **I** use a DHCP and DNS to connect / communicate the nodes.
diff --git a/ksetup/playbook.yaml b/ksetup/playbook.yaml
index 878c6c7..c52ab73 100755
--- a/ksetup/playbook.yaml
+++ b/ksetup/playbook.yaml
@@ -26,6 +26,7 @@
 #    - check vars
     - debug: var=set_hostname
     - debug: var=is_master
+
     - name: Ping check
       ping:
 #
diff --git a/ksetup/tasks_prepare_node.yaml b/ksetup/tasks_prepare_node.yaml
index 38880f3..49cf1be 100755
--- a/ksetup/tasks_prepare_node.yaml
+++ b/ksetup/tasks_prepare_node.yaml
@@ -69,7 +69,7 @@
     mode: '0755'
 #  ignore_errors: true
 
-## Docker repo
+## Docker repo ARM/x64
 - name: Add Docker GPG key
   apt_key:
     url: https://download.docker.com/linux/debian/gpg
@@ -89,17 +89,18 @@
   when:
     - ansible_architecture == "x86_64"
 
-## Kubeshit repo ARM
+## Kubeshit repo
 
-- name: Add Kubernetes GPG key (ARM)
+- name: Add Kubernetes GPG key
   apt_key:
-    url: https://packages.cloud.google.com/apt/doc/apt-key.gpg
+#    url: https://packages.cloud.google.com/apt/doc/apt-key.gpg # Old
+    url: https://pkgs.k8s.io/core:/stable:/v1.28/deb/Release.key
     state: present
 
-
 - name: Add Kubernetes APT repository
   apt_repository:
-    repo: deb https://apt.kubernetes.io/ kubernetes-xenial main
+    repo: deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.28/deb/ /
+#    repo: deb https://apt.kubernetes.io/ kubernetes-xenial main
     state: present
 
 
@@ -114,6 +115,7 @@
       - kubelet
       - kubeadm
       - kubectl
+      - nfs-common # Required for NFS mounts
       - git # fuck it, you will need it, maybe
       - vim # fuck it, I need it.