From 98d388c9fa07a06ad3fe4edbc637d607ac29f84c Mon Sep 17 00:00:00 2001
From: clambin <christophe.lambin@gmail.com>
Date: Sat, 10 Jul 2021 14:28:52 +0200
Subject: [PATCH] support 'k3s server --data-dir' to put k3s server files in a
 non-standard location

Signed-off-by: clambin <christophe.lambin@gmail.com>
---
 roles/k3s/master/defaults/main.yml        |  2 ++
 roles/k3s/master/tasks/main.yml           | 10 +++++-----
 roles/k3s/master/templates/k3s.service.j2 |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)
 create mode 100644 roles/k3s/master/defaults/main.yml

diff --git a/roles/k3s/master/defaults/main.yml b/roles/k3s/master/defaults/main.yml
new file mode 100644
index 0000000..c56778f
--- /dev/null
+++ b/roles/k3s/master/defaults/main.yml
@@ -0,0 +1,2 @@
+---
+k3s_server_location: /var/lib/rancher/k3s
diff --git a/roles/k3s/master/tasks/main.yml b/roles/k3s/master/tasks/main.yml
index 614986a..77b58f6 100644
--- a/roles/k3s/master/tasks/main.yml
+++ b/roles/k3s/master/tasks/main.yml
@@ -18,21 +18,21 @@
 
 - name: Wait for node-token
   wait_for:
-    path: /var/lib/rancher/k3s/server/node-token
+    path: "{{ k3s_server_location }}/server/node-token"
 
 - name: Register node-token file access mode
   stat:
-    path: /var/lib/rancher/k3s/server
+    path: "{{ k3s_server_location }}/server/node-token"
   register: p
 
 - name: Change file access node-token
   file:
-    path: /var/lib/rancher/k3s/server
+    path: "{{ k3s_server_location }}/server/node-token"
     mode: "g+rx,o+rx"
 
 - name: Read node-token from master
   slurp:
-    src: /var/lib/rancher/k3s/server/node-token
+    path: "{{ k3s_server_location }}/server/node-token"
   register: node_token
 
 - name: Store Master node-token
@@ -41,7 +41,7 @@
 
 - name: Restore node-token file access
   file:
-    path: /var/lib/rancher/k3s/server
+    path: "{{ k3s_server_location }}/server/node-token"
     mode: "{{ p.stat.mode }}"
 
 - name: Create directory .kube
diff --git a/roles/k3s/master/templates/k3s.service.j2 b/roles/k3s/master/templates/k3s.service.j2
index ae5cb48..a56ab10 100644
--- a/roles/k3s/master/templates/k3s.service.j2
+++ b/roles/k3s/master/templates/k3s.service.j2
@@ -7,7 +7,7 @@ After=network-online.target
 Type=notify
 ExecStartPre=-/sbin/modprobe br_netfilter
 ExecStartPre=-/sbin/modprobe overlay
-ExecStart=/usr/local/bin/k3s server {{ extra_server_args | default("") }}
+ExecStart=/usr/local/bin/k3s server --data-dir {{ k3s_server_location }} {{ extra_server_args | default("") }}
 KillMode=process
 Delegate=yes
 # Having non-zero Limit*s causes performance problems due to accounting overhead