From 30a385b1e6b95ce3ac11f101c82046c41434fa03 Mon Sep 17 00:00:00 2001
From: Dreaded_X <tim@huizinga.dev>
Date: Wed, 15 Apr 2026 23:12:12 +0200
Subject: [PATCH] feat: Use new headscale auth keys

---
 talos/clusters/default.yaml             |   3 ---
 talos/clusters/testing.yaml             |   3 +++
 talos/clusters/titan.yaml               |   3 +++
 talos/nodes/testing/talos-vm.yaml       |   2 ++
 talos/patches/networking/tailscale.yaml |   2 +-
 talos/secrets/tailscale.key             | Bin 71 -> 0 bytes
 talos/secrets/testing/tailscale.key     | Bin 0 -> 111 bytes
 talos/secrets/titan/tailscale.key       | Bin 0 -> 111 bytes
 8 files changed, 9 insertions(+), 4 deletions(-)
 delete mode 100644 talos/secrets/tailscale.key
 create mode 100644 talos/secrets/testing/tailscale.key
 create mode 100644 talos/secrets/titan/tailscale.key

diff --git a/talos/clusters/default.yaml b/talos/clusters/default.yaml
index 385a65d..a74caeb 100644
--- a/talos/clusters/default.yaml
+++ b/talos/clusters/default.yaml
@@ -45,9 +45,6 @@ default:
       - 8.8.8.8
     tailscale:
       server: https://headscale.huizinga.dev
-      authKey:
-        file: tailscale.key
-      advertiseRoutes: true
   ntp: nl.pool.ntp.org
   install:
     auto: true
diff --git a/talos/clusters/testing.yaml b/talos/clusters/testing.yaml
index a67ab30..c097238 100644
--- a/talos/clusters/testing.yaml
+++ b/talos/clusters/testing.yaml
@@ -10,6 +10,9 @@ default:
     interface: ens5
     netmask: 255.255.255.0
     gateway: 192.168.1.1
+    tailscale:
+      authKey:
+        file: testing/tailscale.key
   sops:
     file: testing/age.key
   install:
diff --git a/talos/clusters/titan.yaml b/talos/clusters/titan.yaml
index 2c5e1b2..1a90e97 100644
--- a/talos/clusters/titan.yaml
+++ b/talos/clusters/titan.yaml
@@ -11,6 +11,9 @@ default:
   network:
     netmask: 255.255.252.0
     gateway: 10.0.0.1
+    tailscale:
+      authKey:
+        file: testing/tailscale.key
   sops:
     file: titan/age.key
   install:
diff --git a/talos/nodes/testing/talos-vm.yaml b/talos/nodes/testing/talos-vm.yaml
index 0042cca..c76c678 100644
--- a/talos/nodes/testing/talos-vm.yaml
+++ b/talos/nodes/testing/talos-vm.yaml
@@ -4,3 +4,5 @@ install:
   serial: talos-vm
 network:
   ip: 192.168.1.2
+  tailscale:
+    advertiseRoutes: true
diff --git a/talos/patches/networking/tailscale.yaml b/talos/patches/networking/tailscale.yaml
index d52e94d..b0ba849 100644
--- a/talos/patches/networking/tailscale.yaml
+++ b/talos/patches/networking/tailscale.yaml
@@ -4,5 +4,5 @@ kind: ExtensionServiceConfig
 name: tailscale
 environment:
   - TS_AUTHKEY={{ node.network.tailscale.authKey }}
-  - TS_EXTRA_ARGS={% if node.network.tailscale.server %}--login-server {{ node.network.tailscale.server }} {% endif %}--advertise-tags=tag:cluster-{{ cluster.name }}
+  - TS_EXTRA_ARGS={% if node.network.tailscale.server %}--login-server {{ node.network.tailscale.server }}{% endif +%}
   - TS_ROUTES={% if node.network.tailscale.advertiseRoutes %}{{node.network.ip}}/{{ node.network.netmask | to_prefix }}{% endif %}
diff --git a/talos/secrets/tailscale.key b/talos/secrets/tailscale.key
deleted file mode 100644
index 89f0b3a52753eb1cd856133a1c1f1784bba5d5f9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 71
zcmV-N0J#4EM@dveQdv+`07zLBmqmIcNLznL5I!i-n$1)n7+z<(rZ36Xi41L`{>p&9
d4k@RQ=D72bS{Hg6n(qA-5H<H3(f3t(P;AZB9=rem

diff --git a/talos/secrets/testing/tailscale.key b/talos/secrets/testing/tailscale.key
new file mode 100644
index 0000000000000000000000000000000000000000..73b08c12567c85f1ac88e76bcd34a49a94da69db
GIT binary patch
literal 111
zcmV-#0FeIxM@dveQdv+`05u#S6*=Khu}L(|lstQlBITlMdp@9=dR=Bt>_V_$o!&}b
zz-h151xf)<M}OG}7QMZ4HLT9Hqz*}LUqbxA0JI>$(;e?xOL?1KUN*v=0^#a*NWjA}
R8^f=UC{EQ})ror~N=qO_F<bxu

literal 0
HcmV?d00001

diff --git a/talos/secrets/titan/tailscale.key b/talos/secrets/titan/tailscale.key
new file mode 100644
index 0000000000000000000000000000000000000000..7202c5db8f890861fc49a517cf9c7ae39652d005
GIT binary patch
literal 111
zcmV-#0FeIxM@dveQdv+`0Qy5!khazfGqIcZ564LrUAzxZUKIBfo%k7bbrAJIbwiI;
zS(w|Cu(FOM3^gv;rBv79RP_o03nuQ{T?G@@05DmfLP8cZWHK|VO~s2}=pCh#aU*_Z
RU-uk7UJ!Ety(&NPbyEifE!6-3

literal 0
HcmV?d00001