feat: move flux repos and settings to kubernetes dir

.github/workflows/flux-diff.yaml

@@ -36,6 +36,7 @@ jobs:
         uses: tj-actions/changed-files@v45
         with:
           files: kubernetes/**
+          files_ignore: kubernetes/shared/**
           dir_names: true
           dir_names_max_depth: 2
           matrix: true
@@ -93,13 +94,18 @@ jobs:
       - name: Generate Diff
         id: diff
         run: |
-          echo "diff<<EOF" >> $GITHUB_OUTPUT
-          cat diff.patch >> $GITHUB_OUTPUT
-          echo "EOF" >> $GITHUB_OUTPUT
-          echo "### Diff" >> $GITHUB_STEP_SUMMARY
-          echo '```diff' >> $GITHUB_STEP_SUMMARY
-          cat diff.patch >> $GITHUB_STEP_SUMMARY
-          echo '```' >> $GITHUB_STEP_SUMMARY
+          cat diff.patch;
+          {
+            echo 'diff<<EOF'
+            cat diff.patch
+            echo EOF
+          } >> "$GITHUB_OUTPUT";
+          {
+            echo "### Diff"
+            echo '```diff'
+            cat diff.patch
+            echo '```'
+          } >> "$GITHUB_STEP_SUMMARY"
 
       - if: ${{ steps.diff.outputs.diff != '' }}
         name: Add comment

.github/workflows/flux-image-test.yaml

@@ -36,6 +36,7 @@ jobs:
         uses: tj-actions/changed-files@v45
         with:
           files: kubernetes/**
+          files_ignore: kubernetes/shared/**
           dir_names: true
           dir_names_max_depth: 2
           matrix: true

kubernetes/main/apps/default/kustomization.yaml

@@ -14,7 +14,6 @@ resources:
   - ./filebrowser/ks.yaml
   - ./go2rtc/ks.yaml
   - ./home-assistant/ks.yaml
-  - ./kopia/ks.yaml
   - ./minio/ks.yaml
   - ./miniflux/ks.yaml
   - ./omegabrr/ks.yaml

kubernetes/main/apps/network/cloudflared/app/dnsendpoint.yaml

@@ -8,4 +8,4 @@ spec:
   endpoints:
     - dnsName: external.devbu.io
       recordType: CNAME
-      targets: ["${CLUSTER_CLOUDFLARE_TUNNEL_ID}.cfargotunnel.com"]
+      targets: ["13a8cf0a-e16c-468b-a7c2-1fdd1719394e.cfargotunnel.com"]

kubernetes/main/apps/network/cloudflared/app/externalsecret.yaml

@@ -17,7 +17,7 @@ spec:
           {
             "AccountTag": "{{ .CLOUDFLARE_ACCOUNT_TAG }}",
             "TunnelSecret": "{{ .CLOUDFLARE_TUNNEL_SECRET }}",
-            "TunnelID": "${CLUSTER_CLOUDFLARE_TUNNEL_ID}"
+            "TunnelID": "13a8cf0a-e16c-468b-a7c2-1fdd1719394e"
           }
   dataFrom:
     - extract:

kubernetes/main/apps/network/cloudflared/app/helmrelease.yaml

@@ -49,7 +49,7 @@ spec:
               - --config
               - /etc/cloudflared/config/config.yaml
               - run
-              - "${CLUSTER_CLOUDFLARE_TUNNEL_ID}"
+              - 13a8cf0a-e16c-468b-a7c2-1fdd1719394e
             probes:
               liveness: &probes
                 enabled: true

kubernetes/main/flux/apps.yaml

@@ -6,7 +6,7 @@ metadata:
   name: cluster-apps
   namespace: flux-system
 spec:
-  interval: 10m
+  interval: 30m
   path: ./kubernetes/main/apps
   prune: true
   sourceRef:
@@ -20,7 +20,7 @@ spec:
     substituteFrom:
       - name: cluster-settings
         kind: ConfigMap
-        optional: false
+        optional: true
       - name: cluster-secrets
         kind: Secret
         optional: true
@@ -39,7 +39,7 @@ spec:
             substituteFrom:
               - name: cluster-settings
                 kind: ConfigMap
-                optional: false
+                optional: true
               - name: cluster-secrets
                 kind: Secret
                 optional: true

kubernetes/main/flux/config/cluster.yaml

@@ -15,8 +15,24 @@ spec:
   ignore: |
     # exclude all
     /*
-    # include flux directories
+    # include dirs
     !/kubernetes/main
+    !/kubernetes/shared
+---
+# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/kustomize.toolkit.fluxcd.io/kustomization_v1.json
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: cluster-shared
+  namespace: flux-system
+spec:
+  interval: 30m
+  path: ./kubernetes/shared
+  prune: true
+  wait: true
+  sourceRef:
+    kind: GitRepository
+    name: home-kubernetes
 ---
 # yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/kustomize.toolkit.fluxcd.io/kustomization_v1.json
 apiVersion: kustomize.toolkit.fluxcd.io/v1
@@ -26,6 +42,8 @@ metadata:
   namespace: flux-system
 spec:
   interval: 30m
+  dependsOn:
+    - name: cluster-shared
   path: ./kubernetes/main/flux
   prune: true
   wait: false
@@ -40,7 +58,7 @@ spec:
     substituteFrom:
       - name: cluster-settings
         kind: ConfigMap
-        optional: false
+        optional: true
       - name: cluster-secrets
         kind: Secret
         optional: true

kubernetes/main/flux/config/kustomization.yaml

@@ -2,6 +2,7 @@
 # yaml-language-server: $schema=https://json.schemastore.org/kustomization
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
+namespace: flux-system
 resources:
-  - ./flux.yaml
   - ./cluster.yaml
+  - ./flux.yaml

kubernetes/main/flux/repositories/git/kustomization.yaml → kubernetes/main/flux/repos/kustomization.yaml

@@ -2,4 +2,5 @@
 # yaml-language-server: $schema=https://json.schemastore.org/kustomization
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
+namespace: flux-system
 resources: []