From c1af3dbb4c28c5d0687eef89b20520a96bff1966 Mon Sep 17 00:00:00 2001
From: Devin Buhl <devin@buhl.casa>
Date: Thu, 23 May 2024 11:15:36 -0400
Subject: [PATCH] fix: move helmfile up a directory

Signed-off-by: Devin Buhl <devin@buhl.casa>
---
 .taskfiles/Talos/Taskfile.yaml                |  2 +-
 .../bootstrap/{talos => }/helmfile.yaml.j2    | 22 +++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)
 rename bootstrap/templates/kubernetes/bootstrap/{talos => }/helmfile.yaml.j2 (84%)

diff --git a/.taskfiles/Talos/Taskfile.yaml b/.taskfiles/Talos/Taskfile.yaml
index aa9857d9..94992e07 100644
--- a/.taskfiles/Talos/Taskfile.yaml
+++ b/.taskfiles/Talos/Taskfile.yaml
@@ -6,7 +6,7 @@ vars:
   TALOS_DIR: "{{.KUBERNETES_DIR}}/bootstrap/talos"
   TALHELPER_SECRET_FILE: "{{.TALOS_DIR}}/talsecret.sops.yaml"
   TALHELPER_CONFIG_FILE: "{{.TALOS_DIR}}/talconfig.yaml"
-  HELMFILE_FILE: "{{.TALOS_DIR}}/helmfile.yaml"
+  HELMFILE_FILE: "{{.KUBERNETES_DIR}}/bootstrap/helmfile.yaml"
 
 env:
   TALOSCONFIG: "{{.TALOS_DIR}}/clusterconfig/talosconfig"
diff --git a/bootstrap/templates/kubernetes/bootstrap/talos/helmfile.yaml.j2 b/bootstrap/templates/kubernetes/bootstrap/helmfile.yaml.j2
similarity index 84%
rename from bootstrap/templates/kubernetes/bootstrap/talos/helmfile.yaml.j2
rename to bootstrap/templates/kubernetes/bootstrap/helmfile.yaml.j2
index f97743bd..ca614c0d 100644
--- a/bootstrap/templates/kubernetes/bootstrap/talos/helmfile.yaml.j2
+++ b/bootstrap/templates/kubernetes/bootstrap/helmfile.yaml.j2
@@ -1,4 +1,11 @@
 ---
+helmDefaults:
+  wait: true
+  waitForJobs: true
+  timeout: 600
+  recreatePods: true
+  force: true
+
 repositories:
   - name: cilium
     url: https://helm.cilium.io
@@ -7,13 +14,6 @@ repositories:
   - name: postfinance
     url: https://postfinance.github.io/kubelet-csr-approver
 
-helmDefaults:
-  wait: true
-  waitForJobs: true
-  timeout: 600
-  recreatePods: true
-  force: true
-
 releases:
   - name: prometheus-operator-crds
     namespace: observability
@@ -24,7 +24,7 @@ releases:
     chart: cilium/cilium
     version: 1.15.5
     values:
-      - ../../apps/kube-system/cilium/app/helm-values.yaml
+      - ../apps/kube-system/cilium/app/helm-values.yaml
     needs:
       - observability/prometheus-operator-crds
   - name: coredns
@@ -32,7 +32,7 @@ releases:
     chart: coredns/coredns
     version: 1.29.0
     values:
-      - ../../apps/kube-system/coredns/app/helm-values.yaml
+      - ../apps/kube-system/coredns/app/helm-values.yaml
     needs:
       - observability/prometheus-operator-crds
       - kube-system/cilium
@@ -41,7 +41,7 @@ releases:
     chart: postfinance/kubelet-csr-approver
     version: 1.2.1
     values:
-      - ../../apps/kube-system/kubelet-csr-approver/app/helm-values.yaml
+      - ../apps/kube-system/kubelet-csr-approver/app/helm-values.yaml
     needs:
       - observability/prometheus-operator-crds
       - kube-system/cilium
@@ -51,7 +51,7 @@ releases:
     chart: oci://ghcr.io/spegel-org/helm-charts/spegel
     version: v0.0.22
     values:
-      - ../../apps/kube-system/spegel/app/helm-values.yaml
+      - ../apps/kube-system/spegel/app/helm-values.yaml
     needs:
       - observability/prometheus-operator-crds
       - kube-system/cilium