Unverified Commit 5a51955d authored by Dmitriy Safronov's avatar Dmitriy Safronov Committed by GitHub
Browse files

apiserver_endpoint == default(hostvars[groups['master'][0]]['ansible_host'] |... 

apiserver_endpoint == default(hostvars[groups['master'][0]]['ansible_host'] | default(groups['master'][0])) (#2)
parent 838afd2d

roles/k3s/master/tasks/main.yml

+3 −3
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
        cmd: k3s kubectl get nodes -l "node-role.kubernetes.io/master=true" -o=jsonpath="{.items[*].metadata.name}"

      register: nodes

      until: nodes.rc == 0 and (nodes.stdout.split() | length) == (groups['master'] | length)

      retries: 20

      retries: 30

      delay: 10

      changed_when: false

  always:
@@ -98,10 +98,10 @@ 
    owner: "{{ ansible_user }}"

    mode: "u=rw,g=,o="



- name: Configure kubectl cluster to https://{{ apiserver_endpoint }}:6443

- name: Configure kubectl cluster to https://{{ apiserver_endpoint | default(hostvars[groups['master'][0]]['ansible_host'] | default(groups['master'][0])) }}:6443

  command: >-

    k3s kubectl config set-cluster default

      --server=https://{{ apiserver_endpoint }}:6443

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

      --kubeconfig ~{{ ansible_user }}/.kube/config

  changed_when: true

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 {{ hostvars[groups['master'][0]]['token'] | default(k3s_token) }} {{ extra_agent_args | default("") }}

ExecStart=/usr/local/bin/k3s agent --server https://{{ apiserver_endpoint | default(hostvars[groups['master'][0]]['ansible_host'] | default(groups['master'][0])) }}: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