Merge branch 'master' into k3s-ha

collections/requirements.yml

+---
+collections:
+  - name: community.general

inventory/sample/group_vars/all.yml

 ---
-k3s_version: v1.17.5+k3s1
+k3s_version: v1.22.3+k3s1
 ansible_user: debian
 systemd_dir: /etc/systemd/system
 

roles/k3s/master/defaults/main.yml

 ---
-ansible_user: root
 server_init_args: >-
   {% if groups['master'] | length > 1 %}
     {% if ansible_host == hostvars[groups['master'][0]]['ansible_host'] | default(groups['master'][0]) %}

roles/k3s/master/tasks/main.yml

@@ -46,7 +46,7 @@
     dest: "{{ systemd_dir }}/k3s.service"
     owner: root
     group: root
-    mode: 0755
+    mode: 0644
 
 - name: Enable and check K3s service
   systemd:
@@ -57,21 +57,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
@@ -80,7 +80,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

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

roles/prereq/tasks/main.yml

@@ -17,6 +17,7 @@
     value: "1"
     state: present
     reload: yes
+  when: ansible_all_ipv6_addresses
 
 - name: Add br_netfilter to /etc/modules-load.d/
   copy:

roles/reset/tasks/main.yml

@@ -31,12 +31,12 @@
     name: "{{ item }}"
     state: absent
   with_items:
+    - /usr/local/bin/k3s
     - "{{ systemd_dir }}/k3s.service"
     - "{{ systemd_dir }}/k3s-node.service"
     - /etc/rancher/k3s
     - /var/lib/kubelet
     - /var/lib/rancher/k3s
-    - /usr/local/bin/k3s
 
 - name: daemon_reload
   systemd:

roles/reset/tasks/umount_with_children.yml

@@ -6,6 +6,7 @@
     executable: /bin/bash
   failed_when: false
   changed_when: get_mounted_filesystems.stdout | length > 0
+  check_mode: false
 
 - name: Umount filesystem
   mount: