Refactor bootstrap into shared dir

.gitignore

@@ -4,7 +4,6 @@
 Brewfile.lock.json
 # Kubernetes
 kubeconfig
-talosconfig
 .decrypted~*
 *.secret.env
 *.secret.yaml
@@ -17,6 +16,9 @@ talosconfig
 # Private
 .private
 .bin
+#Talos
+talosconfig
+**/clusterconfig
 # Terraform
 .terraform
 .terraform.tfstate*
@@ -26,5 +28,3 @@ terraform.tfstate*
 # Trash
 .DS_Store
 Thumbs.db
-#Talos
-**/clusterconfig

.taskfiles/bootstrap/Taskfile.yaml

@@ -15,83 +15,84 @@ tasks:
     preconditions:
       - op user get --me
       - talosctl config info
-      - test -f {{.BOOTSTRAP_DIR}}/talos/clusterconfig/talosconfig
-      - 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
+      - test -f {{.BOOTSTRAP_TALOS_DIR}}/clusterconfig/talosconfig
+      - test -f {{.BOOTSTRAP_DIR}}/helmfile.yaml
+      - test -f {{.BOOTSTRAP_DIR}}/templates/resources.yaml.j2
+      - test -f {{.BOOTSTRAP_DIR}}/templates/wipe-rook.yaml.gotmpl
       - which curl jq helmfile kubectl op talosctl
 
   gen-secrets:
     desc: Generate the Talos secrets
     cmds:
-      - talhelper -f {{.BOOTSTRAP_DIR}}/talos/talconfig.yaml gensecret > {{.BOOTSTRAP_DIR}}/talos/talsecret.sops.yaml
+      - talhelper -f {{.BOOTSTRAP_TALOS_DIR}}/talconfig.yaml gensecret > {{.BOOTSTRAP_TALOS_DIR}}/talsecret.sops.yaml
       - task: :sops:.encrypt-file
         vars:
-          FILE: "{{.BOOTSTRAP_DIR}}/talos/talsecret.sops.yaml"
+          FILE: "{{.BOOTSTRAP_TALOS_DIR}}/talsecret.sops.yaml"
     requires:
       vars: [CLUSTER]
     preconditions:
-      - test -f {{.BOOTSTRAP_DIR}}/talos/talconfig.yaml
+      - test -f {{.BOOTSTRAP_TALOS_DIR}}/talconfig.yaml
     status:
-      - test -f "{{.BOOTSTRAP_DIR}}/talos/talsecret.sops.yaml"
+      - test -f "{{.BOOTSTRAP_TALOS_DIR}}/talsecret.sops.yaml"
 
   gen-config:
     desc: Generate the Talos configs
-    cmd: talhelper -c {{.BOOTSTRAP_DIR}}/talos/talconfig.yaml genconfig -s {{.BOOTSTRAP_DIR}}/talos/talsecret.sops.yaml -o {{.BOOTSTRAP_DIR}}/talos/clusterconfig
+    cmd: talhelper -c {{.BOOTSTRAP_TALOS_DIR}}/talconfig.yaml genconfig -s {{.BOOTSTRAP_TALOS_DIR}}/talsecret.sops.yaml -o {{.BOOTSTRAP_TALOS_DIR}}/clusterconfig
     requires:
       vars: [CLUSTER]
     preconditions:
-      - test -f {{.BOOTSTRAP_DIR}}/talos/talconfig.yaml
-      - test -f {{.BOOTSTRAP_DIR}}/talos/talsecret.sops.yaml
+      - test -f {{.BOOTSTRAP_TALOS_DIR}}/talconfig.yaml
+      - test -f {{.BOOTSTRAP_TALOS_DIR}}/talsecret.sops.yaml
 
   apply-config:
     desc: Apply the Talos config on a nodes for a new cluster
-    dir: "{{.BOOTSTRAP_DIR}}/talos/"
+    dir: "{{.BOOTSTRAP_TALOS_DIR}}/"
     cmd: talhelper gencommand apply --extra-flags=--insecure | bash
     requires:
       vars: [CLUSTER]
     preconditions:
-      - test -f {{.BOOTSTRAP_DIR}}/talos/talconfig.yaml
-      - test -f {{.BOOTSTRAP_DIR}}/talos/talsecret.sops.yaml
+      - test -f {{.BOOTSTRAP_TALOS_DIR}}/talconfig.yaml
+      - test -f {{.BOOTSTRAP_TALOS_DIR}}/talsecret.sops.yaml
 
   talos:
     desc: Bootstrap Talos [CLUSTER=pi5]
     cmds:
-      - until talosctl --nodes {{.TALOS_CONTROLLER}} bootstrap --talosconfig {{.BOOTSTRAP_DIR}}/talos/clusterconfig/talosconfig; do sleep 5; done
-      - talosctl kubeconfig --nodes {{.TALOS_CONTROLLER}} --force --force-context-name {{.CLUSTER}} {{.CLUSTER_DIR}} --talosconfig {{.BOOTSTRAP_DIR}}/talos/clusterconfig/talosconfig
+      - until talosctl --nodes {{.TALOS_CONTROLLER}} bootstrap --talosconfig {{.BOOTSTRAP_TALOS_DIR}}/clusterconfig/talosconfig; do sleep 5; done
+      - talosctl kubeconfig --nodes {{.TALOS_CONTROLLER}} --force --force-context-name {{.CLUSTER}} {{.CLUSTER_DIR}} --talosconfig {{.BOOTSTRAP_TALOS_DIR}}/clusterconfig/talosconfig
     vars:
       TALOS_CONTROLLER:
-        sh: talosctl config info --output json --context {{.CLUSTER}} --talosconfig {{.BOOTSTRAP_DIR}}/talos/clusterconfig/talosconfig | jq --raw-output '.endpoints[]' | shuf -n 1
+        sh: talosctl config info --output json --context {{.CLUSTER}} --talosconfig {{.BOOTSTRAP_TALOS_DIR}}/clusterconfig/talosconfig | jq --raw-output '.endpoints[]' | shuf -n 1
     requires:
       vars: [CLUSTER]
     preconditions:
       - talosctl config info
-      - test -f {{.BOOTSTRAP_DIR}}/talos/clusterconfig/talosconfig
+      - test -f {{.BOOTSTRAP_TALOS_DIR}}/clusterconfig/talosconfig
       - which talosctl jq
 
   apps:
     desc: Bootstrap Apps [CLUSTER=pi5]
     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 {{.BOOTSTRAP_DIR}}/apps/.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 || true
+      - op run --env-file {{.BOOTSTRAP_DIR}}/.secrets.env --no-masking -- minijinja-cli {{.BOOTSTRAP_DIR}}/templates/resources.yaml.j2 | kubectl apply --server-side --filename -
+      - helmfile --quiet --file {{.BOOTSTRAP_DIR}}/helmfile.yaml apply --skip-diff-on-install --suppress-diff
+      - helmfile --quiet --file {{.BOOTSTRAP_DIR}}/helmfile.yaml destroy --selector name=wipe-rook || true
       - '{{if eq .NODE_COUNT 1}}talosctl reboot -n {{.TALOS_CONTROLLER}}{{end}}'
     vars:
       TALOS_CONTROLLER:
-        sh: talosctl config info --output json --context {{.CLUSTER}} --talosconfig {{.BOOTSTRAP_DIR}}/talos/clusterconfig/talosconfig | jq --raw-output '.endpoints[]'
+        sh: talosctl config info --output json --context {{.CLUSTER}} --talosconfig {{.BOOTSTRAP_TALOS_DIR}}/clusterconfig/talosconfig | jq --raw-output '.endpoints[]'
     env:
       NODE_COUNT:
         sh: talosctl --context {{.CLUSTER}} config info --output json | jq --raw-output '.nodes | length'
       VAULT: kubernetes # ¯\_(ツ)_/¯
+      CLUSTER: '{{.CLUSTER}}'
     requires:
       vars: [CLUSTER]
     preconditions:
       - op user get --me
       - talosctl config info
-      - test -f {{.BOOTSTRAP_DIR}}/talos/clusterconfig/talosconfig
-      - 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
+      - test -f {{.BOOTSTRAP_TALOS_DIR}}/clusterconfig/talosconfig
+      - test -f {{.BOOTSTRAP_DIR}}/helmfile.yaml
+      - test -f {{.BOOTSTRAP_DIR}}/templates/resources.yaml.j2
+      - test -f {{.BOOTSTRAP_DIR}}/templates/wipe-rook.yaml.gotmpl
       - which curl jq helmfile kubectl op talosctl

.taskfiles/talos/Taskfile.yaml

@@ -5,30 +5,30 @@ version: "3"
 tasks:
   genconfig:
     desc: Generate the Talos configs
-    cmd: talhelper -c {{.BOOTSTRAP_DIR}}/talos/talconfig.yaml genconfig -s {{.BOOTSTRAP_DIR}}/talos/talsecret.sops.yaml -o {{.BOOTSTRAP_DIR}}/talos/clusterconfig
+    cmd: talhelper -c {{.BOOTSTRAP_TALOS_DIR}}/talconfig.yaml genconfig -s {{.BOOTSTRAP_TALOS_DIR}}/talsecret.sops.yaml -o {{.BOOTSTRAP_TALOS_DIR}}/clusterconfig
     requires:
       vars: [CLUSTER]
     preconditions:
-      - test -f {{.BOOTSTRAP_DIR}}/talos/talconfig.yaml
-      - test -f {{.BOOTSTRAP_DIR}}/talos/talsecret.sops.yaml
+      - test -f {{.BOOTSTRAP_TALOS_DIR}}/talconfig.yaml
+      - test -f {{.BOOTSTRAP_TALOS_DIR}}/talsecret.sops.yaml
 
   apply-node:
     desc: Apply Talos config to a node [CLUSTER=pi5] [HOSTNAME=required]
     dotenv: ['{{.CLUSTER_DIR}}/cluster.env']
     cmds:
       # - task: down
-      - talosctl apply-config --nodes {{.HOSTNAME}} --mode={{.MODE}} --file {{.BOOTSTRAP_DIR}}/talos/clusterconfig/{{.CLUSTER}}-{{.HOSTNAME}}.yaml --talosconfig {{.BOOTSTRAP_DIR}}/talos/clusterconfig/talosconfig
-      - talosctl --nodes {{.HOSTNAME}} health --talosconfig {{.BOOTSTRAP_DIR}}/talos/clusterconfig/talosconfig
+      - talosctl apply-config --nodes {{.HOSTNAME}} --mode={{.MODE}} --file {{.BOOTSTRAP_TALOS_DIR}}/clusterconfig/{{.CLUSTER}}-{{.HOSTNAME}}.yaml --talosconfig {{.BOOTSTRAP_TALOS_DIR}}/clusterconfig/talosconfig
+      - talosctl --nodes {{.HOSTNAME}} health --talosconfig {{.BOOTSTRAP_TALOS_DIR}}/clusterconfig/talosconfig
       # - task: up
     vars:
       MODE: '{{.MODE | default "auto"}}'
     requires:
       vars: [CLUSTER, HOSTNAME]
     preconditions:
-      - talosctl --nodes {{.HOSTNAME}} get machineconfig --talosconfig {{.BOOTSTRAP_DIR}}/talos/clusterconfig/talosconfig
+      - talosctl --nodes {{.HOSTNAME}} get machineconfig --talosconfig {{.BOOTSTRAP_TALOS_DIR}}/clusterconfig/talosconfig
       - test -f {{.BOOTSTRAP_DIR}}/cluster.env
-      - test -f {{.BOOTSTRAP_DIR}}/talos/talconfig.yaml
-      - test -f {{.BOOTSTRAP_DIR}}/talos/clusterconfig/talosconfig
+      - test -f {{.BOOTSTRAP_TALOS_DIR}}/talconfig.yaml
+      - test -f {{.BOOTSTRAP_TALOS_DIR}}/clusterconfig/talosconfig
 
   apply-cluster: ## This isn't working on utility cluster
     desc: Apply the Talos config on all nodes for an existing cluster [CLUSTER=pi5]
@@ -44,39 +44,39 @@ tasks:
     requires:
       vars: [CLUSTER]
     preconditions:
-      - talosctl config info --talosconfig {{.BOOTSTRAP_DIR}}/talos/clusterconfig/talosconfig
+      - talosctl config info --talosconfig {{.BOOTSTRAP_TALOS_DIR}}/clusterconfig/talosconfig
       - test -f {{.CLUSTER_DIR}}/cluster.env
-      - test -f {{.BOOTSTRAP_DIR}}/talos/talconfig.yaml
-      - test -f {{.BOOTSTRAP_DIR}}/talos/clusterconfig/talosconfig
+      - test -f {{.BOOTSTRAP_TALOS_DIR}}/talconfig.yaml
+      - test -f {{.BOOTSTRAP_TALOS_DIR}}/clusterconfig/talosconfig
 
   soft-nuke:
     desc: Resets nodes back to maintenance mode so you can re-deploy again straight after
     prompt: This will destroy your cluster and reset the nodes back to maintenance mode... continue?
-    cmd: talhelper gencommand reset -o {{.BOOTSTRAP_DIR}}/talos/clusterconfig -c {{.BOOTSTRAP_DIR}}/talos/talconfig.yaml --extra-flags "--reboot --system-labels-to-wipe STATE --system-labels-to-wipe EPHEMERAL --graceful=false --wait=false" | bash
+    cmd: talhelper gencommand reset -o {{.BOOTSTRAP_TALOS_DIR}}/clusterconfig -c {{.BOOTSTRAP_TALOS_DIR}}/talconfig.yaml --extra-flags "--reboot --system-labels-to-wipe STATE --system-labels-to-wipe EPHEMERAL --graceful=false --wait=false" | bash
     preconditions:
       - { msg: "Argument (CLUSTER) is required", sh: "test -n {{.CLUSTER}}" }
 
   hard-nuke:
     desc: Resets nodes back completely and reboots them
     prompt: This will destroy your cluster and reset the nodes... continue?
-    cmd: talhelper gencommand reset -o {{.BOOTSTRAP_DIR}}/talos/clusterconfig -c {{.BOOTSTRAP_DIR}}/talos/talconfig.yaml --extra-flags "--reboot --graceful=false --wait=false" | bash
+    cmd: talhelper gencommand reset -o {{.BOOTSTRAP_TALOS_DIR}}/clusterconfig -c {{.BOOTSTRAP_TALOS_DIR}}/talconfig.yaml --extra-flags "--reboot --graceful=false --wait=false" | bash
     preconditions:
       - { msg: "Argument (CLUSTER) is required", sh: "test -n {{.CLUSTER}}" }
 
   reboot-node:
     desc: Reboot Talos on a single node [CLUSTER=pi5] [HOSTNAME=required]
     cmds:
       - task: down
-      - talosctl --nodes {{.HOSTNAME}} reboot --talosconfig {{.BOOTSTRAP_DIR}}/talos/clusterconfig/talosconfig
-      - talosctl --nodes {{.HOSTNAME}} health --talosconfig {{.BOOTSTRAP_DIR}}/talos/clusterconfig/talosconfig
+      - talosctl --nodes {{.HOSTNAME}} reboot --talosconfig {{.BOOTSTRAP_TALOS_DIR}}/clusterconfig/talosconfig
+      - talosctl --nodes {{.HOSTNAME}} health --talosconfig {{.BOOTSTRAP_TALOS_DIR}}/clusterconfig/talosconfig
       - task: up
     requires:
       vars: [CLUSTER, HOSTNAME]
     preconditions:
-      - talosctl --nodes {{.HOSTNAME}} get machineconfig --talosconfig {{.BOOTSTRAP_DIR}}/talos/clusterconfig/talosconfig
-      - talosctl config info --talosconfig {{.BOOTSTRAP_DIR}}/talos/clusterconfig/talosconfig
+      - talosctl --nodes {{.HOSTNAME}} get machineconfig --talosconfig {{.BOOTSTRAP_TALOS_DIR}}/clusterconfig/talosconfig
+      - talosctl config info --talosconfig {{.BOOTSTRAP_TALOS_DIR}}/clusterconfig/talosconfig
       - test -f {{.CLUSTER_DIR}}/cluster.env
-      - test -f {{.BOOTSTRAP_DIR}}/talos/talconfig.yaml
+      - test -f {{.BOOTSTRAP_TALOS_DIR}}/talconfig.yaml
       - which talosctl
 
   reboot-cluster:
@@ -97,10 +97,10 @@ tasks:
         vars:
           CLUSTER: "{{.CLUSTER}}"
     preconditions:
-      - talosctl config info --talosconfig {{.BOOTSTRAP_DIR}}/talos/clusterconfig/talosconfig
+      - talosctl config info --talosconfig {{.BOOTSTRAP_TALOS_DIR}}/clusterconfig/talosconfig
       - test -f {{.CLUSTER_DIR}}/cluster.env
-      - test -f {{.BOOTSTRAP_DIR}}/talos/talconfig.yaml
-      - test -f {{.BOOTSTRAP_DIR}}/talos/clusterconfig/talosconfig
+      - test -f {{.BOOTSTRAP_TALOS_DIR}}/talconfig.yaml
+      - test -f {{.BOOTSTRAP_TALOS_DIR}}/clusterconfig/talosconfig
 
   shutdown-cluster:
     desc: Shutdown Talos across the whole cluster [CLUSTER=pi5]
@@ -112,23 +112,23 @@ tasks:
     requires:
       vars: [CLUSTER]
     preconditions:
-      - talosctl --nodes {{.NODES}} get machineconfig --talosconfig {{.BOOTSTRAP_DIR}}/talos/clusterconfig/talosconfig
-      - talosctl config info --talosconfig {{.BOOTSTRAP_DIR}}/talos/clusterconfig/talosconfig
-      - test -f {{.BOOTSTRAP_DIR}}/talos/talconfig.yaml
-      - test -f {{.BOOTSTRAP_DIR}}/talos/clusterconfig/talosconfig
+      - talosctl --nodes {{.NODES}} get machineconfig --talosconfig {{.BOOTSTRAP_TALOS_DIR}}/clusterconfig/talosconfig
+      - talosctl config info --talosconfig {{.BOOTSTRAP_TALOS_DIR}}/clusterconfig/talosconfig
+      - test -f {{.BOOTSTRAP_TALOS_DIR}}/talconfig.yaml
+      - test -f {{.BOOTSTRAP_TALOS_DIR}}/clusterconfig/talosconfig
       - which talosctl
 
   kubeconfig:
     desc: Generate the kubeconfig for a Talos cluster [CLUSTER=pi5]
-    cmd: talosctl kubeconfig --nodes {{.TALOS_CONTROLLER}} --force --force-context-name {{.CLUSTER}} {{.CLUSTER_DIR}} --talosconfig {{.BOOTSTRAP_DIR}}/talos/clusterconfig/talosconfig
+    cmd: talosctl kubeconfig --nodes {{.TALOS_CONTROLLER}} --force --force-context-name {{.CLUSTER}} {{.CLUSTER_DIR}} --talosconfig {{.BOOTSTRAP_TALOS_DIR}}/clusterconfig/talosconfig
     vars:
       TALOS_CONTROLLER:
-        sh: talosctl config info --output json --talosconfig {{.BOOTSTRAP_DIR}}/talos/clusterconfig/talosconfig | jq --raw-output '.endpoints[]' | shuf -n 1
+        sh: talosctl config info --output json --talosconfig {{.BOOTSTRAP_TALOS_DIR}}/clusterconfig/talosconfig | jq --raw-output '.endpoints[]' | shuf -n 1
     requires:
       vars: [CLUSTER]
     preconditions:
-      - talosctl config info --talosconfig {{.BOOTSTRAP_DIR}}/talos/clusterconfig/talosconfig
-      - test -f {{.BOOTSTRAP_DIR}}/talos/clusterconfig/talosconfig
+      - talosctl config info --talosconfig {{.BOOTSTRAP_TALOS_DIR}}/clusterconfig/talosconfig
+      - test -f {{.BOOTSTRAP_TALOS_DIR}}/clusterconfig/talosconfig
       - which talosctl
 
   down:

.taskfiles/volsync/Taskfile.yaml

@@ -56,7 +56,7 @@ tasks:
         cmd: kubectl --namespace {{splitList "," .ITEM | first}} patch --field-manager=flux-client-side-apply replicationsources {{splitList "," .ITEM | last}} --type merge --patch "{\"spec\":{\"restic\":{\"unlock\":\"{{now | unixEpoch}}\"}}}"
     vars:
       SOURCES:
-        sh: kubectl --context {{.CLUSTER}} get replicationsources --all-namespaces --no-headers --output=jsonpath='{range .items[*]}{.metadata.namespace},{.metadata.name}{"\n"}{end}'
+        sh: kubectl get replicationsources --all-namespaces --no-headers --output=jsonpath='{range .items[*]}{.metadata.namespace},{.metadata.name}{"\n"}{end}'
     requires:
       vars: [CLUSTER]
     preconditions:

.taskfiles/volsync/resources/unlock.yaml.j2

@@ -16,7 +16,7 @@ spec:
           args: ["unlock", "--remove-all"]
           envFrom:
             - secretRef:
-                name: {{ ENV.APP }}-volsync-secret
+                name: {{ ENV.APP }}-volsync
           volumeMounts:
             - name: repository
               mountPath: /repository
@@ -26,7 +26,7 @@ spec:
           args: ["unlock", "--remove-all"]
           envFrom:
             - secretRef:
-                name: {{ ENV.APP }}-volsync-r2-secret
+                name: {{ ENV.APP }}-volsync-r2
           resources: {}
       volumes:
         - name: repository

Taskfile.yaml

@@ -8,7 +8,8 @@ shopt: [globstar]
 vars:
   CLUSTER: '{{.CLUSTER | default "pi5"}}'
   CLUSTER_DIR: '{{.ROOT_DIR}}/kubernetes/{{.CLUSTER}}'
-  BOOTSTRAP_DIR: '{{.CLUSTER_DIR}}/bootstrap'
+  BOOTSTRAP_TALOS_DIR: '{{.CLUSTER_DIR}}/talos'
+  BOOTSTRAP_DIR: '{{.ROOT_DIR}}/kubernetes/shared/bootstrap'
 
 env:
   KUBECONFIG: '{{.CLUSTER_DIR}}/kubeconfig'

kubernetes/pi5/apps/cert-manager/kustomization.yaml

@@ -6,5 +6,5 @@ namespace: cert-manager
 resources:
   - ./cert-manager/ks.yaml
 components:
-  - ../../../shared/components/alerts
-  - ../../../shared/components/namespace
+  - ../../../shared/meta/components/alerts
+  - ../../../shared/meta/components/namespace

kubernetes/pi5/apps/default/kustomization.yaml

@@ -5,5 +5,5 @@ kind: Kustomization
 namespace: default
 resources: []
 components:
-  - ../../../shared/components/alerts
-  - ../../../shared/components/namespace
+  - ../../../shared/meta/components/alerts
+  - ../../../shared/meta/components/namespace

kubernetes/pi5/apps/external-secrets/kustomization.yaml

@@ -7,5 +7,5 @@ resources:
   - ./external-secrets/ks.yaml
   - ./onepassword/ks.yaml
 components:
-  - ../../../shared/components/alerts
-  - ../../../shared/components/namespace
+  - ../../../shared/meta/components/alerts
+  - ../../../shared/meta/components/namespace

kubernetes/pi5/apps/flux-system/capacitor/ks.yaml

@@ -9,7 +9,7 @@ spec:
     labels:
       app.kubernetes.io/name: *app
   components:
-    - ../../../../../shared/components/gatus/guarded
+    - ../../../../../shared/meta/components/gatus/guarded
   interval: 30m
   path: ./kubernetes/pi5/apps/flux-system/capacitor/app
   postBuild:

kubernetes/pi5/apps/flux-system/kustomization.yaml

@@ -9,5 +9,5 @@ resources:
   - ./kustomize-mutating-webhook/ks.yaml
   - ./weave-gitops/ks.yaml
 components:
-  - ../../../shared/components/alerts
-  - ../../../shared/components/namespace
+  - ../../../shared/meta/components/alerts
+  - ../../../shared/meta/components/namespace

kubernetes/pi5/apps/kube-system/kustomization.yaml

@@ -8,5 +8,5 @@ resources:
   - ./coredns/ks.yaml
   - ./metrics-server/ks.yaml
 components:
-  - ../../../shared/components/alerts
-  - ../../../shared/components/namespace
+  - ../../../shared/meta/components/alerts
+  - ../../../shared/meta/components/namespace

kubernetes/pi5/apps/kube-tools/kustomization.yaml

@@ -8,5 +8,5 @@ resources:
   - ./reloader/ks.yaml
   # - ./system-upgrade-controller/ks.yaml
 components:
-  - ../../../shared/components/alerts
-  - ../../../shared/components/namespace
+  - ../../../shared/meta/components/alerts
+  - ../../../shared/meta/components/namespace

kubernetes/pi5/apps/network/kustomization.yaml

@@ -7,5 +7,5 @@ resources:
   - ./external/ks.yaml
   - ./internal/ks.yaml
 components:
-  - ../../../shared/components/alerts
-  - ../../../shared/components/namespace
+  - ../../../shared/meta/components/alerts
+  - ../../../shared/meta/components/namespace

kubernetes/pi5/apps/storage/kustomization.yaml

@@ -8,5 +8,5 @@ resources:
   - ./snapshot-controller/ks.yaml
   - ./volsync/ks.yaml
 components:
-  - ../../../shared/components/alerts
-  - ../../../shared/components/namespace
+  - ../../../shared/meta/components/alerts
+  - ../../../shared/meta/components/namespace