From 95cc115734f8999a35bd39a63a2f5555eca798ca Mon Sep 17 00:00:00 2001
From: Felix Nehrke <felix@nehrke.info>
Date: Fri, 19 Sep 2025 14:13:15 +0200
Subject: [PATCH] Move download of kube-config into dedicated role

---
 k3s/download-kube-config.yml         | 15 ---------------
 k3s/roles/kube-config/tasks/main.yml | 19 +++++++++++++++++++
 k3s/site.yml                         | 11 +++++++----
 3 files changed, 26 insertions(+), 19 deletions(-)
 delete mode 100644 k3s/download-kube-config.yml
 create mode 100644 k3s/roles/kube-config/tasks/main.yml

diff --git a/k3s/download-kube-config.yml b/k3s/download-kube-config.yml
deleted file mode 100644
index d92e18f..0000000
--- a/k3s/download-kube-config.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-- hosts: server[0]
-  tasks:
-  - name: Download kube-config
-    fetch:
-      src: /etc/rancher/k3s/k3s.yaml
-      dest: "{{ lookup('env', 'HOME') }}/.kube/config"
-      flat: true
-- hosts: localhost
-  tasks:
-  - name: Use correct ip-address for k8s-cluster
-    lineinfile:
-      path: "{{ lookup('env', 'HOME') }}/.kube/config"
-      regexp: '^(\s*server: https://).*(:\d+)$'
-      line: \g<1>{{ hostvars[groups['server'][0]]['api_endpoint'] }}\g<2>
-      backrefs: yes
diff --git a/k3s/roles/kube-config/tasks/main.yml b/k3s/roles/kube-config/tasks/main.yml
new file mode 100644
index 0000000..a6fb9f5
--- /dev/null
+++ b/k3s/roles/kube-config/tasks/main.yml
@@ -0,0 +1,19 @@
+- name: Download kube-config
+  fetch:
+    src: /etc/rancher/k3s/k3s.yaml
+    dest: "{{ lookup('env', 'HOME') }}/.kube/config.orig"
+    flat: true
+  register: loaded_kube_config
+- name: Copy kube-config to correct location
+  delegate_to: localhost
+  copy:
+    src: "{{ lookup('env', 'HOME') }}/.kube/config.orig"
+    dest: "{{ lookup('env', 'HOME') }}/.kube/config"
+  when: hostvars[groups['server'][0]]['loaded_kube_config'] is changed
+- name: Use correct ip-address for k8s-cluster
+  delegate_to: localhost
+  lineinfile:
+    path: "{{ lookup('env', 'HOME') }}/.kube/config"
+    regexp: '^(\s*server: https://).*(:\d+)$'
+    line: \g<1>{{ hostvars[groups['server'][0]]['api_endpoint'] }}\g<2>
+    backrefs: yes
diff --git a/k3s/site.yml b/k3s/site.yml
index 3ce4968..f47ef78 100644
--- a/k3s/site.yml
+++ b/k3s/site.yml
@@ -16,10 +16,13 @@
   - init
   - add-server
   - add-agent
-- import_playbook: download-kube-config.yml
-  tags:
-  - init
-  - config
 - import_playbook: k3s.orchestration.upgrade
   tags:
   - update
+- hosts: server[0]
+  roles:
+  - role: kube-config
+    tags:
+    - init
+    - config
+    - update