chore(flux): reorganize helm repos (#421)

Taskfile.dist.yaml

@@ -38,6 +38,16 @@ tasks:
     silent: true
     cmds: ["task -l"]
 
+  gitconfig:
+    desc: Configure Git.
+    cmds:
+      - git config commit.gpgSign true
+      - git config pull.rebase true
+      - git config rebase.autostash true
+      - git config push.autoSetupRemote true
+      - git config remote.origin.pushurl git@github.com:JJGadgets/Biohazard.git
+      - test -d $HOME/../usr/etc/termux/ && git config gpg.program $HOME/../usr/bin/okc-gpg || true
+
   n:
     desc: Create new folder and file within new folder at the same time.
     vars:

kube/clusters/biohazard/flux/flux-repo.yaml

@@ -122,6 +122,16 @@ spec:
         version: v1
         kind: Kustomization
         labelSelector: kustomization.flux.home.arpa/default notin (false)
+    - patch: |
+        - op: add
+          path: /spec/dependsOn/-
+          value:
+            name: zzz-flux-repos-helm
+      target:
+        group: kustomize.toolkit.fluxcd.io
+        version: v1
+        kind: Kustomization
+        labelSelector: kustomization.flux.home.arpa/default notin (false)
     - patch: |-
         apiVersion: kustomize.toolkit.fluxcd.io/v1
         kind: Kustomization

kube/clusters/biohazard/flux/kustomization.yaml

@@ -7,7 +7,7 @@ resources:
   - ../config/
   - flux-install.yaml
   - flux-repo.yaml
-  - ../../../repos/
+  - ../../../repos/flux/
   - ../../../deploy/core/_networking/cilium/
   - ../../../deploy/core/_networking/multus/
   - ../../../deploy/core/_networking/tailscale/

kube/clusters/nuclear/flux/kustomization.yaml

@@ -7,7 +7,7 @@ resources:
   - ../config/
   - flux-install.yaml
   - flux-repo.yaml
-  - ../../../repos/
+  - ../../../repos/flux/
   - ../../../deploy/core/_networking/cilium/
   - ../../../deploy/core/kyverno/_deps/
   - ../../../deploy/core/kyverno/

kube/deploy/core/_networking/cilium/kustomization.yaml

@@ -2,5 +2,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - repo.yaml
-  - ks.yaml
+  - ks.yaml

kube/deploy/core/_networking/multus/kustomization.yaml

@@ -2,5 +2,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - repo.yaml
   - ks.yaml

kube/deploy/core/_networking/tailscale/kustomization.yaml

@@ -3,5 +3,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ns.yaml
-  - repo.yaml
   - ks.yaml

kube/deploy/core/db/pg/kustomization.yaml

@@ -3,5 +3,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ns.yaml
-  - repo.yaml
   - ks.yaml

kube/deploy/core/dns/external-dns/kustomization.yaml

@@ -3,6 +3,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ns.yaml
-  - repo.yaml
   - crds.yaml
-  - ks.yaml
+  - ks.yaml

kube/deploy/core/dns/internal/k8s-gateway/kustomization.yaml

@@ -2,5 +2,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - repo.yaml
-  - ks.yaml
+  - ks.yaml

kube/deploy/core/hardware/intel-device-plugins/kustomization.yaml

@@ -2,5 +2,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - repo.yaml
   - ks.yaml

kube/deploy/core/hardware/node-feature-discovery/kustomization.yaml

@@ -2,5 +2,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - repo.yaml
-  - ks.yaml
+  - ks.yaml

kube/deploy/core/ingress/external-proxy-x/kustomization.yaml

@@ -2,5 +2,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - repo.yaml
   - ks.yaml

kube/deploy/core/ingress/ingress-nginx/kustomization.yaml

@@ -2,5 +2,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - repo.yaml
-  - ks.yaml
+  - ks.yaml

kube/deploy/core/kyverno/kustomization.yaml

@@ -3,5 +3,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ns.yaml
-  - repo.yaml
   - ks.yaml

kube/deploy/core/monitoring/_deps/kustomization.yaml

@@ -4,6 +4,4 @@ kind: Kustomization
 resources:
   - ns.yaml
   - _crds-prometheus.yaml
-  - prometheus-community-charts.yaml
-  - repo-grafana.yaml
   - netpol.yaml

kube/deploy/core/monitoring/metrics-server/kustomization.yaml

@@ -2,5 +2,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - repo.yaml
   - ks.yaml

kube/deploy/core/secrets/external-secrets/kustomization.yaml

@@ -3,5 +3,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ns.yaml
-  - repo.yaml
   - ks.yaml

kube/deploy/core/spegel/kustomization.yaml

@@ -2,5 +2,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - repo.yaml
   - ks.yaml

kube/deploy/core/storage/csi-driver-nfs/kustomization.yaml

@@ -2,5 +2,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - repo.yaml
   - ks.yaml

kube/deploy/core/storage/democratic-csi/_deps/kustomization.yaml

@@ -3,4 +3,3 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ns.yaml
-  - repo.yaml

kube/deploy/core/storage/rook-ceph/kustomization.yaml

@@ -3,5 +3,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ns.yaml
-  - repo.yaml
   - ks.yaml

kube/deploy/core/storage/volsync/kustomization.yaml

@@ -3,5 +3,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ns.yaml
-  - repo.yaml
   - ks.yaml

kube/deploy/core/tls/cert-manager/kustomization.yaml

@@ -3,6 +3,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ns.yaml
-  - repo.yaml
   - crds.yaml
-  - ks.yaml
+  - ks.yaml

kube/repos/flux/ks.yaml

@@ -0,0 +1,11 @@
+---
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: zzz-flux-repos-helm
+  namespace: flux-system
+spec:
+  path: ./kube/repos/flux/helm
+  dependsOn: []
+  wait: true
+  prune: true

kube/repos/flux/kustomization.yaml

@@ -1,5 +1,5 @@
+---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - helm/app-template/helmrepo.yaml
-  - helm/stakater/helmrepo.yaml
+  - ks.yaml