From 5a51955d7050337bfe6777a55bbe3a32c0f393d8 Mon Sep 17 00:00:00 2001
From: Dmitriy Safronov <DmitriySafronov@users.noreply.github.com>
Date: Tue, 24 Jan 2023 00:59:53 +0400
Subject: [PATCH] apiserver_endpoint ==
default(hostvars[groups['master'][0]]['ansible_host'] |
default(groups['master'][0])) (#2)
---
roles/k3s/master/tasks/main.yml | 6 +++---
roles/k3s/node/templates/k3s.service.j2 | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/roles/k3s/master/tasks/main.yml b/roles/k3s/master/tasks/main.yml
index 2cf0865..0a9811e 100644
--- a/roles/k3s/master/tasks/main.yml
+++ b/roles/k3s/master/tasks/main.yml
@@ -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
diff --git a/roles/k3s/node/templates/k3s.service.j2 b/roles/k3s/node/templates/k3s.service.j2
index 01baa64..9280681 100644
--- a/roles/k3s/node/templates/k3s.service.j2
+++ b/roles/k3s/node/templates/k3s.service.j2
@@ -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
--
GitLab