From 7dea9091003923bec455a6fcf64eaf0a9cdc11f4 Mon Sep 17 00:00:00 2001 From: Tanguy Herbron Date: Thu, 20 Jun 2024 14:48:29 +0200 Subject: [PATCH] fix(vars): Set proper IPs for k3s configuration on Wireguard --- inventory/group_vars/all.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/inventory/group_vars/all.yml b/inventory/group_vars/all.yml index 96c8b1e..4d2a288 100644 --- a/inventory/group_vars/all.yml +++ b/inventory/group_vars/all.yml @@ -1,6 +1,6 @@ --- -k3s_version: "v1.28.5+k3s1" +k3s_version: "v1.29.2+k3s1" systemd_dir: "/etc/systemd/system" -master_ip: "{{ hostvars[groups['master'][0]]['ansible_eth1'].ipv4.address | default(groups['master'][0]) }}" -extra_server_args: "--disable traefik --advertise-address {{hostvars[inventory_hostname]['ansible_eth1'].ipv4.address}} --tls-san {{ ansible_host }} --disable servicelb {{ ['--node-label']|product(hostvars[inventory_hostname]['k3s_label'])|map('join', ' ')|join(' ') }}" -extra_agent_args: "--node-external-ip {{hostvars[inventory_hostname]['ansible_default_ipv4']['address']}} {{ ['--node-label']|product(hostvars[inventory_hostname]['k3s_label'])|map('join', ' ')|join(' ') }}" +master_ip: "{{ hostvars[groups['master'][0]]['wireguard_ip'] | default(groups['master'][0]) }}" +extra_server_args: "--disable traefik --advertise-address {{hostvars[inventory_hostname]['wireguard_ip']}} --flannel-iface wg0 --tls-san {{ ansible_host }} --disable servicelb {{ ['--node-label']|product(hostvars[inventory_hostname]['k3s_label'])|map('join', ' ')|join(' ') }}" +extra_agent_args: "--flannel-iface wg0 --node-external-ip {{hostvars[inventory_hostname]['wireguard_ip']}} {{ ['--node-label']|product(hostvars[inventory_hostname]['k3s_label'])|map('join', ' ')|join(' ') }}"