From d4fd43e2f576df50efb7cd0a8bdd015852d9c020 Mon Sep 17 00:00:00 2001 From: MichaelFisher1997 Date: Sat, 21 Mar 2026 15:48:33 +0000 Subject: [PATCH] refactor: simplify k3s-server bootstrap for --- ansible/roles/k3s-server/tasks/main.yml | 32 ++++++++++--------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/ansible/roles/k3s-server/tasks/main.yml b/ansible/roles/k3s-server/tasks/main.yml index ddd901e..1d104ea 100644 --- a/ansible/roles/k3s-server/tasks/main.yml +++ b/ansible/roles/k3s-server/tasks/main.yml @@ -58,22 +58,19 @@ when: k3s_install_needed - name: Install k3s server (primary) - environment: - INSTALL_K3S_VERSION: "{{ k3s_version if k3s_version != 'latest' else '' }}" - K3S_TOKEN: "{{ k3s_token }}" - command: >- - /tmp/install-k3s.sh server - --cluster-init - --advertise-address={{ k3s_primary_ip }} - --node-ip={{ k3s_node_ip }} - --tls-san={{ k3s_primary_ip }} - --tls-san={{ k3s_primary_public_ip }} - {% if k3s_disable_embedded_ccm | bool %}--disable-cloud-controller{% endif %} - {% if k3s_disable_servicelb | bool %}--disable=servicelb{% endif %} - {% if k3s_kubelet_cloud_provider_external | bool %}--kubelet-arg=cloud-provider=external{% endif %} - when: - - k3s_install_needed - - k3s_primary | default(false) + environment: + INSTALL_K3S_VERSION: "{{ k3s_version if k3s_version != 'latest' else '' }}" + K3S_TOKEN: "{{ k3s_token }}" + command: >- + /tmp/install-k3s.sh server + --cluster-init + --advertise-address={{ k3s_primary_ip }} + --node-ip={{ k3s_node_ip }} + --tls-san={{ k3s_primary_ip }} + --tls-san={{ k3s_primary_public_ip }} + when: + - k3s_install_needed + - k3s_primary | default(false) - name: Install k3s server (secondary) when: @@ -89,9 +86,6 @@ --server https://{{ k3s_primary_ip }}:6443 --advertise-address={{ k3s_node_ip }} --node-ip={{ k3s_node_ip }} - {% if k3s_disable_embedded_ccm | bool %}--disable-cloud-controller{% endif %} - {% if k3s_disable_servicelb | bool %}--disable=servicelb{% endif %} - {% if k3s_kubelet_cloud_provider_external | bool %}--kubelet-arg=cloud-provider=external{% endif %} register: secondary_install rescue: