From de4faf86ca864dc11d055f9a125e3d737868723e Mon Sep 17 00:00:00 2001
From: pgijsbertsen <117165507+pgijsbertsen@users.noreply.github.com>
Date: Wed, 19 Nov 2025 11:13:38 +0100
Subject: [PATCH] fix: Resolve Cilium bootstrap issues

---
 .../talos-bootstrap/templates/cilium-install.yaml.tmpl        | 4 ++--
 .../talos-bootstrap/templates/machineconfig-cp.yaml.tmpl      | 2 +-
 .../talos-bootstrap/templates/machineconfig-worker.yaml.tmpl  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/templates/cilium-install.yaml.tmpl b/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/templates/cilium-install.yaml.tmpl
index a18f449..8e85a73 100644
--- a/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/templates/cilium-install.yaml.tmpl
+++ b/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/templates/cilium-install.yaml.tmpl
@@ -85,9 +85,9 @@ spec:
           - --set
           - cgroup.hostRoot=/sys/fs/cgroup
           - --set
-          - k8sServiceHost=auto
+          - k8sServiceHost=$(KUBERNETES_SERVICE_HOST)
           - --set
-          - k8sServicePort=6443
+          - k8sServicePort=$(KUBERNETES_SERVICE_PORT)
           - --set
           - gatewayAPI.enabled=true
           - --set
diff --git a/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/templates/machineconfig-cp.yaml.tmpl b/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/templates/machineconfig-cp.yaml.tmpl
index bc81f6c..67829b1 100644
--- a/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/templates/machineconfig-cp.yaml.tmpl
+++ b/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/templates/machineconfig-cp.yaml.tmpl
@@ -38,7 +38,7 @@ cluster:
     disabled: true
   extraManifests:
   - https://github.com/kubernetes-sigs/gateway-api/releases/download/v${gateway-api_version}/standard-install.yaml
-  - https://raw.githubusercontent.com/alex1989hu/kubelet-serving-cert-approver/main/deploy/standalone-install.yaml
+  - https://raw.githubusercontent.com/alex1989hu/kubelet-serving-cert-approver/refs/heads/main/deploy/standalone-install.yaml
   inlineManifests:
   - name: cilium-bootstrap
     contents: |
diff --git a/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/templates/machineconfig-worker.yaml.tmpl b/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/templates/machineconfig-worker.yaml.tmpl
index 95b4d12..3637e5b 100644
--- a/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/templates/machineconfig-worker.yaml.tmpl
+++ b/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/templates/machineconfig-worker.yaml.tmpl
@@ -33,7 +33,7 @@ cluster:
     disabled: true
   extraManifests:
   - https://github.com/kubernetes-sigs/gateway-api/releases/download/v${gateway-api_version}/standard-install.yaml
-  - https://raw.githubusercontent.com/alex1989hu/kubelet-serving-cert-approver/main/deploy/standalone-install.yaml
+  - https://raw.githubusercontent.com/alex1989hu/kubelet-serving-cert-approver/refs/heads/main/deploy/standalone-install.yaml
   inlineManifests:
   - name: cilium-bootstrap
     contents: |