From d68fefe9a4b4a145bf02b69a9674a8a48f14400a Mon Sep 17 00:00:00 2001
From: Asara <amarpreet@minhas.io>
Date: Wed, 23 Nov 2022 00:43:04 -0500
Subject: [PATCH] Update k3s role to allow for multiple clusters

---
 ansible/group_vars/hardtack/main.yml          | 1 +
 ansible/group_vars/teapot/main.yml            | 3 +++
 ansible/host_vars/teapot01.minhas.io/main.yml | 3 +++
 ansible/inventory.txt                         | 1 +
 ansible/roles/common/tasks/Debian.yml         | 2 +-
 ansible/roles/k3s/tasks/server.yml            | 6 ++++++
 ansible/roles/k3s/templates/k3s.service.j2    | 2 +-
 7 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 ansible/host_vars/teapot01.minhas.io/main.yml

diff --git a/ansible/group_vars/hardtack/main.yml b/ansible/group_vars/hardtack/main.yml
index 9e62a5b..729c3e2 100644
--- a/ansible/group_vars/hardtack/main.yml
+++ b/ansible/group_vars/hardtack/main.yml
@@ -5,3 +5,4 @@ nomad_arch: arm64
 docker_arch: arm64
 k3s_version: v1.24.1+k3s1
 k3s_role: 'client'
+k3s_server_hostname: hardtack1.minhas.io
diff --git a/ansible/group_vars/teapot/main.yml b/ansible/group_vars/teapot/main.yml
index c427ce9..dae36d8 100644
--- a/ansible/group_vars/teapot/main.yml
+++ b/ansible/group_vars/teapot/main.yml
@@ -1,3 +1,6 @@
 ---
 hashi_arch: arm
 consul_arch: arm64
+k3s_version: v1.25.4+k3s1
+k3s_role: 'client'
+k3s_server_hostname: teapot01.minhas.io
diff --git a/ansible/host_vars/teapot01.minhas.io/main.yml b/ansible/host_vars/teapot01.minhas.io/main.yml
new file mode 100644
index 0000000..99f030e
--- /dev/null
+++ b/ansible/host_vars/teapot01.minhas.io/main.yml
@@ -0,0 +1,3 @@
+---
+k3s_role: server
+...
diff --git a/ansible/inventory.txt b/ansible/inventory.txt
index 3980d47..2818822 100644
--- a/ansible/inventory.txt
+++ b/ansible/inventory.txt
@@ -22,6 +22,7 @@ teapot[01:06].minhas.io
 
 [k3s]
 hardtack[1:7].minhas.io
+teapot[01:06].minhas.io
 
 [lnd]
 redwingcherokee.minhas.io
diff --git a/ansible/roles/common/tasks/Debian.yml b/ansible/roles/common/tasks/Debian.yml
index efe771d..a41e17f 100644
--- a/ansible/roles/common/tasks/Debian.yml
+++ b/ansible/roles/common/tasks/Debian.yml
@@ -23,6 +23,7 @@
       - kitty-terminfo
       - make
       - ncdu
+      - neovim
       - netcat-openbsd
       - ntp
       - screen
@@ -31,7 +32,6 @@
       - tmux
       - tree
       - unzip
-      - vim
     state: present
 
 - name: apt autoremove
diff --git a/ansible/roles/k3s/tasks/server.yml b/ansible/roles/k3s/tasks/server.yml
index 1890432..2a5c0ea 100644
--- a/ansible/roles/k3s/tasks/server.yml
+++ b/ansible/roles/k3s/tasks/server.yml
@@ -22,4 +22,10 @@
 - name: set k3s token var
   set_fact:
     k3s_node_token: "{{ registered_k3s_node_token.content | b64decode | trim }}"
+
+- name: set kubectl symlink
+  file:
+    state: link
+    src: /usr/local/bin/k3s
+    dest: /usr/local/bin/kubectl
 ...
diff --git a/ansible/roles/k3s/templates/k3s.service.j2 b/ansible/roles/k3s/templates/k3s.service.j2
index c1a885a..e1f6032 100644
--- a/ansible/roles/k3s/templates/k3s.service.j2
+++ b/ansible/roles/k3s/templates/k3s.service.j2
@@ -8,7 +8,7 @@ ExecReload=/bin/kill -HUP $MAINPID
 {% if k3s_role == 'server' %}
 ExecStart=/usr/local/bin/k3s server --write-kubeconfig-mode 644 --disable servicelb --disable traefik
 {% else %}
-ExecStart=/usr/local/bin/k3s agent --server https://hardtack1.minhas.io:6443 --token {{ hostvars['hardtack1.minhas.io'].k3s_node_token }}
+ExecStart=/usr/local/bin/k3s agent --server https://{{ k3s_server_hostname }}:6443 --token {{ hostvars[k3s_server_hostname].k3s_node_token }}
 {% endif %}
 KillMode=process
 KillSignal=SIGINT