support 'k3s server --data-dir' to put k3s server files in a non-standard location

Signed-off-by: clambin <christophe.lambin@gmail.com>
This commit is contained in:
clambin 2021-07-10 14:28:52 +02:00
parent ef8d3a1949
commit 98d388c9fa
3 changed files with 8 additions and 6 deletions

View File

@ -0,0 +1,2 @@
---
k3s_server_location: /var/lib/rancher/k3s

View File

@ -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

View File

@ -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