Commit 4ed55994 authored by Julien DOCHE's avatar Julien DOCHE
Browse files

Fix k3s_token default value 



Signed-off-by: default avatarJulien DOCHE <julien.doche@gmail.com>
parent 59b20d43

inventory/sample/group_vars/all.yml

+2 −1
Original line number Diff line number Diff line
@@ -7,9 +7,10 @@ systemd_dir: /etc/systemd/system 
# apiserver endpoint to all masters here. This default value is only suitable

# for a non-HA setup, if used in a HA setup, it will not protect you if the

# first node fails.

# Also you should define k3s_token so that masters can talk together securely



apiserver_endpoint: "{{ hostvars[groups['master'][0]]['ansible_host'] | default(groups['master'][0]) }}"

# k3s_token: "mysupersecuretoken"



extra_server_args: ""

extra_agent_args: ""
 
k3s_token: ""

roles/k3s/master/defaults/main.yml

+1 −0
Original line number Diff line number Diff line
@@ -7,5 +7,6 @@ server_init_args: >- 
    {% else %}

      --server https://{{ hostvars[groups['master'][0]]['ansible_host'] | default(groups['master'][0]) }}:6443

    {% endif %}

    --token {{ k3s_token }}

  {% endif %}

  {{ extra_server_args | default('') }}

roles/k3s/master/tasks/main.yml

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
  command:

    cmd: "systemd-run -p RestartSec=2 \

                      -p Restart=on-failure \

                      -E K3S_TOKEN={{ k3s_token }} \

                      --unit=k3s-init \

                      k3s server {{ server_init_args }}"

    creates: "{{ systemd_dir }}/k3s.service"

roles/k3s/node/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 agent --server https://{{ apiserver_endpoint }}:6443 --token {{ k3s_token }} {{ extra_agent_args | default("") }}

ExecStart=/usr/local/bin/k3s agent --server https://{{ apiserver_endpoint }}:6443 --token {{ hostvars[groups['master'][0]]['token'] | default(k3s_token) }} {{ extra_agent_args | default("") }}

KillMode=process

Delegate=yes

# Having non-zero Limit*s causes performance problems due to accounting overhead