Unverified Commit 1e5e60bf authored by Dmitriy Safronov's avatar Dmitriy Safronov Committed by GitHub
Browse files

Merge branch 'master' into k3s-ha

parents 6922d286 8e708124

collections/requirements.yml

0 → 100644
+3 −0
Original line number Diff line number Diff line 
---

collections:

  - name: community.general

inventory/sample/group_vars/all.yml

+1 −1
Original line number Diff line number Diff line 
---

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

+0 −1
Original line number Diff line number Diff line 
---

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

+6 −6
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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