fix: update file paths

Signed-off-by: Devin Buhl <[email protected]>

.github/workflows/flux-diff.yaml

@@ -50,8 +50,8 @@ jobs:
           args: >-
             diff ${{ matrix.resources }}
             --unified 6
-            --path /github/workspace/pull/kubernetes/flux/config
-            --path-orig /github/workspace/default/kubernetes/flux/config
+            --path /github/workspace/pull/kubernetes/flux/cluster
+            --path-orig /github/workspace/default/kubernetes/flux/cluster
             --strip-attrs "helm.sh/chart,checksum/config,app.kubernetes.io/version,chart"
             --limit-bytes 10000
             --all-namespaces

.github/workflows/pre-pull-images.yaml

@@ -45,7 +45,7 @@ jobs:
         with:
           args: >-
             get cluster
-            --path /github/workspace/kubernetes/flux
+            --path /github/workspace/kubernetes/flux/cluster
             --enable-images
             --output yaml
             --output-file images.yaml

.taskfiles/bootstrap/Taskfile.yaml

@@ -6,7 +6,7 @@ tasks:
 
   talos:
     desc: Bootstrap Talos
-    dotenv: ['{{.CLUSTER_DIR}}/cluster.env']
+    dotenv: ['{{.BOOTSTRAP_DIR}}/.cluster.env']
     cmds:
       - for: { var: TALOS_NODES }
         cmd: >
@@ -18,7 +18,7 @@ tasks:
       TALOS_CONTROLLER:
         sh: talosctl config info --output json | jq --raw-output '.endpoints[]' | shuf -n 1
       TALOS_NODES:
-        sh: ls {{.CLUSTER_DIR}}/talos/*.j2
+        sh: ls {{.BOOTSTRAP_DIR}}/talos/*.j2
     preconditions:
       - talosctl config info
       - test -f {{.CLUSTER_DIR}}/talosconfig
@@ -29,9 +29,9 @@ tasks:
     prompt: Bootstrap apps into the Talos cluster?
     cmds:
       - until kubectl wait nodes --for=condition=Ready=False --all --timeout=10m; do sleep 5; done
-      - op run --env-file {{.CLUSTER_DIR}}/bootstrap/bootstrap.env --no-masking -- minijinja-cli {{.CLUSTER_DIR}}/bootstrap/templates/resources.yaml.j2 | kubectl apply --server-side --filename -
-      - helmfile --quiet --file {{.CLUSTER_DIR}}/bootstrap/helmfile.yaml apply --skip-diff-on-install --suppress-diff
-      - helmfile --quiet --file {{.CLUSTER_DIR}}/bootstrap/helmfile.yaml destroy --selector release=wipe-rook
+      - op run --env-file {{.BOOTSTRAP_DIR}}/.secrets.env --no-masking -- minijinja-cli {{.BOOTSTRAP_DIR}}/apps/templates/resources.yaml.j2 | kubectl apply --server-side --filename -
+      - helmfile --quiet --file {{.BOOTSTRAP_DIR}}/apps/helmfile.yaml apply --skip-diff-on-install --suppress-diff
+      - helmfile --quiet --file {{.BOOTSTRAP_DIR}}/apps/helmfile.yaml destroy --selector name=wipe-rook
     env:
       FLUX_GITHUB_PUBLIC_KEYS:
         sh: curl -fsSL https://api.github.com/meta | jq --raw-output '"github.com "+.ssh_keys[]'
@@ -45,7 +45,7 @@ tasks:
       - op user get --me
       - talosctl config info
       - test -f {{.CLUSTER_DIR}}/talosconfig
-      - test -f {{.CLUSTER_DIR}}/bootstrap/helmfile.yaml
-      - test -f {{.CLUSTER_DIR}}/bootstrap/templates/resources.yaml.j2
-      - test -f {{.CLUSTER_DIR}}/bootstrap/templates/wipe-rook.yaml.gotmpl
+      - test -f {{.BOOTSTRAP_DIR}}/apps/helmfile.yaml
+      - test -f {{.BOOTSTRAP_DIR}}/apps/templates/resources.yaml.j2
+      - test -f {{.BOOTSTRAP_DIR}}/apps/templates/wipe-rook.yaml.gotmpl
       - which curl jq helmfile kubectl op talosctl

.taskfiles/talos/Taskfile.yaml

@@ -6,10 +6,10 @@ tasks:
 
   apply-node:
     desc: Apply Talos config to a node [IP=required]
-    dotenv: ['{{.CLUSTER_DIR}}/cluster.env']
+    dotenv: ['{{.BOOTSTRAP_DIR}}/.cluster.env']
     cmds:
       - task: down
-      - sops exec-file --input-type yaml --output-type yaml {{.CLUSTER_DIR}}/talos/{{.IP}}.sops.yaml.j2 "minijinja-cli {}" | talosctl --nodes {{.IP}} apply-config --mode={{.MODE}} --file /dev/stdin
+      - sops exec-file --input-type yaml --output-type yaml {{.BOOTSTRAP_DIR}}/talos/{{.IP}}.sops.yaml.j2 "minijinja-cli {}" | talosctl --nodes {{.IP}} apply-config --mode={{.MODE}} --file /dev/stdin
       - talosctl --nodes {{.IP}} health
       - task: up
     vars:
@@ -18,14 +18,14 @@ tasks:
       vars: [IP]
     preconditions:
       - talosctl --nodes {{.IP}} get machineconfig
-      - test -f {{.CLUSTER_DIR}}/cluster.env
-      - test -f {{.CLUSTER_DIR}}/talos/{{.IP}}.sops.yaml.j2
+      - test -f {{.BOOTSTRAP_DIR}}/.cluster.env
+      - test -f {{.BOOTSTRAP_DIR}}/talos/{{.IP}}.sops.yaml.j2
       - test -f {{.CLUSTER_DIR}}/talosconfig
       - which minijinja-cli sops talosctl
 
   upgrade-node:
     desc: Upgrade Talos on a single node [IP=required]
-    dotenv: ['{{.CLUSTER_DIR}}/cluster.env']
+    dotenv: ['{{.BOOTSTRAP_DIR}}/.cluster.env']
     cmds:
       - task: down
       - talosctl --nodes {{.IP}} upgrade --image="factory.talos.dev/installer/{{.TALOS_SCHEMATIC_ID}}:$TALOS_VERSION" --timeout=10m
@@ -40,13 +40,13 @@ tasks:
       - curl -fsSL -o /dev/null --fail https://github.com/siderolabs/talos/releases/tag/$TALOS_VERSION
       - talosctl --nodes {{.IP}} get machineconfig
       - talosctl config info
-      - test -f {{.CLUSTER_DIR}}/cluster.env
+      - test -f {{.BOOTSTRAP_DIR}}/.cluster.env
       - test -f {{.CLUSTER_DIR}}/talosconfig
       - which jq kubectl talosctl
 
   upgrade-k8s:
     desc: Upgrade Kubernetes across the whole cluster [VERSION=required]
-    dotenv: ['{{.CLUSTER_DIR}}/cluster.env']
+    dotenv: ['{{.BOOTSTRAP_DIR}}/.cluster.env']
     cmds:
       - task: down
       - talosctl --nodes {{.TALOS_CONTROLLER}} upgrade-k8s --to $KUBERNETES_VERSION
@@ -58,7 +58,7 @@ tasks:
       - curl -fsSL -o /dev/null --fail https://github.com/siderolabs/kubelet/releases/tag/$KUBERNETES_VERSION
       - talosctl --nodes {{.TALOS_CONTROLLER}} get machineconfig
       - talosctl config info
-      - test -f {{.CLUSTER_DIR}}/cluster.env
+      - test -f {{.BOOTSTRAP_DIR}}/.cluster.env
       - test -f {{.CLUSTER_DIR}}/talosconfig
       - which jq talosctl
 
@@ -76,7 +76,7 @@ tasks:
     preconditions:
       - talosctl --nodes {{.IP}} get machineconfig
       - talosctl config info
-      - test -f {{.CLUSTER_DIR}}/cluster.env
+      - test -f {{.BOOTSTRAP_DIR}}/.cluster.env
       - test -f {{.CLUSTER_DIR}}/talosconfig
       - which talosctl
 

Taskfile.yaml

@@ -7,6 +7,7 @@ shopt: [globstar]
 
 vars:
   CLUSTER_DIR: '{{.ROOT_DIR}}/kubernetes'
+  BOOTSTRAP_DIR: '{{.CLUSTER_DIR}}/bootstrap'
 
 env:
   KUBECONFIG: '{{.CLUSTER_DIR}}/kubeconfig'

kubernetes/main/apps/default/pinchflat/app/kustomization.yaml → kubernetes/apps/default/atuin/app/kustomization.yaml

@@ -4,5 +4,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ./helmrelease.yaml
-  - ../../../../../shared/templates/gatus/guarded
-  - ../../../../../shared/templates/volsync
+  - ../../../../templates/gatus/guarded
+  - ../../../../templates/volsync

kubernetes/main/apps/default/autobrr/app/kustomization.yaml → kubernetes/apps/default/autobrr/app/kustomization.yaml

@@ -5,8 +5,8 @@ kind: Kustomization
 resources:
   - ./externalsecret.yaml
   - ./helmrelease.yaml
-  - ../../../../../shared/templates/gatus/guarded
-  - ../../../../../shared/templates/volsync
+  - ../../../../templates/gatus/guarded
+  - ../../../../templates/volsync
 configMapGenerator:
   - name: autobrr-loki-rules
     files:

kubernetes/main/apps/default/bazarr/app/kustomization.yaml → kubernetes/apps/default/bazarr/app/kustomization.yaml

@@ -5,8 +5,8 @@ kind: Kustomization
 resources:
   - ./externalsecret.yaml
   - ./helmrelease.yaml
-  - ../../../../../shared/templates/gatus/guarded
-  - ../../../../../shared/templates/volsync
+  - ../../../../templates/gatus/guarded
+  - ../../../../templates/volsync
 configMapGenerator:
   - name: bazarr-scripts
     files:

kubernetes/main/apps/default/go2rtc/app/kustomization.yaml → kubernetes/apps/default/go2rtc/app/kustomization.yaml

@@ -4,7 +4,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ./helmrelease.yaml
-  - ../../../../../shared/templates/gatus/guarded
+  - ../../../../templates/gatus/guarded
 configMapGenerator:
   - name: go2rtc-configmap
     files:

kubernetes/main/apps/default/jellyseerr/app/kustomization.yaml → kubernetes/apps/default/home-assistant/app/kustomization.yaml

@@ -6,5 +6,5 @@ resources:
   - ./externalsecret.yaml
   - ./pvc.yaml
   - ./helmrelease.yaml
-  - ../../../../../shared/templates/gatus/external
-  - ../../../../../shared/templates/volsync
+  - ../../../../templates/gatus/external
+  - ../../../../templates/volsync

kubernetes/main/apps/default/home-assistant/app/kustomization.yaml → kubernetes/apps/default/jellyseerr/app/kustomization.yaml

@@ -6,5 +6,5 @@ resources:
   - ./externalsecret.yaml
   - ./pvc.yaml
   - ./helmrelease.yaml
-  - ../../../../../shared/templates/gatus/external
-  - ../../../../../shared/templates/volsync
+  - ../../../../templates/gatus/external
+  - ../../../../templates/volsync

kubernetes/apps/default/pinchflat/app/kustomization.yaml

@@ -0,0 +1,8 @@
+---
+# yaml-language-server: $schema=https://json.schemastore.org/kustomization
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ./helmrelease.yaml
+  - ../../../../templates/gatus/guarded
+  - ../../../../templates/volsync

kubernetes/main/apps/default/plex/app/kustomization.yaml → kubernetes/apps/default/plex/app/kustomization.yaml

@@ -5,8 +5,8 @@ kind: Kustomization
 resources:
   - ./pvc.yaml
   - ./helmrelease.yaml
-  - ../../../../../shared/templates/gatus/external
-  - ../../../../../shared/templates/volsync
+  - ../../../../templates/gatus/external
+  - ../../../../templates/volsync
 configMapGenerator:
   - name: plex-loki-rules
     files:

kubernetes/main/apps/default/prowlarr/app/kustomization.yaml → kubernetes/apps/default/prowlarr/app/kustomization.yaml

@@ -5,5 +5,5 @@ kind: Kustomization
 resources:
   - ./externalsecret.yaml
   - ./helmrelease.yaml
-  - ../../../../../shared/templates/gatus/guarded
-  - ../../../../../shared/templates/volsync
+  - ../../../../templates/gatus/guarded
+  - ../../../../templates/volsync

kubernetes/main/apps/default/qbittorrent/app/kustomization.yaml → kubernetes/apps/default/qbittorrent/app/kustomization.yaml

@@ -5,8 +5,8 @@ kind: Kustomization
 resources:
   - ./externalsecret.yaml
   - ./helmrelease.yaml
-  - ../../../../../shared/templates/gatus/guarded
-  - ../../../../../shared/templates/volsync
+  - ../../../../templates/gatus/guarded
+  - ../../../../templates/volsync
 configMapGenerator:
   - name: qbittorrent-loki-rules
     files:

kubernetes/main/apps/default/radarr/app/kustomization.yaml → kubernetes/apps/default/radarr/app/kustomization.yaml

@@ -6,8 +6,8 @@ resources:
   - ./externalsecret.yaml
   - ./pvc.yaml
   - ./helmrelease.yaml
-  - ../../../../../shared/templates/gatus/guarded
-  - ../../../../../shared/templates/volsync
+  - ../../../../templates/gatus/guarded
+  - ../../../../templates/volsync
 configMapGenerator:
   - name: radarr-configmap
     files:

kubernetes/main/apps/default/recyclarr/app/kustomization.yaml → kubernetes/apps/default/recyclarr/app/kustomization.yaml

@@ -5,7 +5,7 @@ kind: Kustomization
 resources:
   - ./externalsecret.yaml
   - ./helmrelease.yaml
-  - ../../../../../shared/templates/volsync
+  - ../../../../templates/volsync
 configMapGenerator:
   - name: recyclarr-configmap
     files:

kubernetes/main/apps/default/sabnzbd/app/kustomization.yaml → kubernetes/apps/default/sabnzbd/app/kustomization.yaml

@@ -5,8 +5,8 @@ kind: Kustomization
 resources:
   - ./externalsecret.yaml
   - ./helmrelease.yaml
-  - ../../../../../shared/templates/gatus/guarded
-  - ../../../../../shared/templates/volsync
+  - ../../../../templates/gatus/guarded
+  - ../../../../templates/volsync
 configMapGenerator:
   - name: sabnzbd-scripts
     files:

kubernetes/main/apps/default/slskd/app/kustomization.yaml → kubernetes/apps/default/slskd/app/kustomization.yaml

@@ -6,7 +6,7 @@ resources:
   - ./externalsecret.yaml
   - ./pvc.yaml
   - ./helmrelease.yaml
-  - ../../../../../shared/templates/gatus/guarded
+  - ../../../../templates/gatus/guarded
 configMapGenerator:
   - name: slskd-configmap
     files:

kubernetes/main/apps/default/sonarr/app/kustomization.yaml → kubernetes/apps/default/sonarr/app/kustomization.yaml

@@ -6,8 +6,8 @@ resources:
   - ./externalsecret.yaml
   - ./pvc.yaml
   - ./helmrelease.yaml
-  - ../../../../../shared/templates/gatus/guarded
-  - ../../../../../shared/templates/volsync
+  - ../../../../templates/gatus/guarded
+  - ../../../../templates/volsync
 configMapGenerator:
   - name: sonarr-configmap
     files:

kubernetes/main/apps/default/tautulli/app/kustomization.yaml → kubernetes/apps/default/tautulli/app/kustomization.yaml

@@ -5,5 +5,5 @@ kind: Kustomization
 resources:
   - ./pvc.yaml
   - ./helmrelease.yaml
-  - ../../../../../shared/templates/gatus/guarded
-  - ../../../../../shared/templates/volsync
+  - ../../../../templates/gatus/guarded
+  - ../../../../templates/volsync

kubernetes/main/apps/default/zigbee/app/kustomization.yaml → kubernetes/apps/default/zigbee/app/kustomization.yaml

@@ -5,8 +5,8 @@ kind: Kustomization
 resources:
   - ./externalsecret.yaml
   - ./helmrelease.yaml
-  - ../../../../../shared/templates/gatus/guarded
-  - ../../../../../shared/templates/volsync
+  - ../../../../templates/gatus/guarded
+  - ../../../../templates/volsync
 configMapGenerator:
   - name: zigbee-loki-rules
     files:

kubernetes/main/apps/default/zwave/app/kustomization.yaml → kubernetes/apps/default/zwave/app/kustomization.yaml

@@ -5,5 +5,5 @@ kind: Kustomization
 resources:
   - ./pvc.yaml
   - ./helmrelease.yaml
-  - ../../../../../shared/templates/gatus/guarded
-  - ../../../../../shared/templates/volsync
+  - ../../../../templates/gatus/guarded
+  - ../../../../templates/volsync

kubernetes/main/apps/flux-system/flux-operator/instance/helm-values.yaml → kubernetes/apps/flux-system/flux-operator/instance/helm-values.yaml

@@ -14,7 +14,7 @@ instance:
     kind: GitRepository
     url: ssh://[email protected]/onedr0p/home-ops
     ref: refs/heads/main
-    path: kubernetes/main/flux/config
+    path: kubernetes/flux/cluster
     pullSecret: github-deploy-key
   commonMetadata:
     labels:

kubernetes/main/apps/rook-ceph/rook-ceph/cluster/kustomization.yaml → kubernetes/apps/network/echo-server/app/kustomization.yaml

@@ -4,4 +4,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ./helmrelease.yaml
-  - ../../../../../shared/templates/gatus/guarded
+  - ../../../../templates/gatus/external

kubernetes/main/apps/observability/grafana/app/kustomization.yaml → kubernetes/apps/observability/grafana/app/kustomization.yaml

@@ -5,4 +5,4 @@ kind: Kustomization
 resources:
   - ./externalsecret.yaml
   - ./helmrelease.yaml
-  - ../../../../../shared/templates/gatus/guarded
+  - ../../../../templates/gatus/guarded

kubernetes/main/apps/observability/kromgo/app/kustomization.yaml → kubernetes/apps/observability/kromgo/app/kustomization.yaml

@@ -4,7 +4,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ./helmrelease.yaml
-  - ../../../../../shared/templates/gatus/external
+  - ../../../../templates/gatus/external
 configMapGenerator:
   - name: kromgo-configmap
     files:

kubernetes/main/apps/observability/kube-prometheus-stack/app/kustomization.yaml → kubernetes/apps/observability/kube-prometheus-stack/app/kustomization.yaml

@@ -7,4 +7,4 @@ resources:
   - ./externalsecret.yaml
   - ./helmrelease.yaml
   - ./scrapeconfig.yaml
-  - ../../../../../shared/templates/gatus/guarded
+  - ../../../../templates/gatus/guarded