🚑 flux substitution

2025-09-17 18:24:14 +02:00 · 2023-12-01 00:56:03 +01:00
parent ecd5d88142
commit 04c4214fad
92 changed files with 3 additions and 889 deletions
--- a/archive/kubernetes/attic/ks.yaml
+++ b/archive/kubernetes/attic/ks.yaml
@@ -10,14 +10,6 @@ spec:
    - name: cluster-apps-cloudnative-pg-cluster
    - name: cluster-apps-external-secrets-stores
  path: ./kubernetes/apps/default/attic/apiserver
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
@@ -36,14 +28,6 @@ spec:
  dependsOn:
    - name: cluster-apps-attic-appiserver
  path: ./kubernetes/apps/default/attic/garbage-collector
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/archive/kubernetes/gitea/ks.yaml
+++ b/archive/kubernetes/gitea/ks.yaml
@@ -7,14 +7,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/default/gitea/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/archive/kubernetes/kyverno/ks.yaml
+++ b/archive/kubernetes/kyverno/ks.yaml
@@ -7,14 +7,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/kyverno/kyverno/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
@@ -33,14 +25,6 @@ spec:
  dependsOn:
    - name: cluster-apps-kyverno
  path: ./kubernetes/apps/kyverno/kyverno/policies
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/archive/kubernetes/pushover-notifier/ks.yaml
+++ b/archive/kubernetes/pushover-notifier/ks.yaml
@@ -10,14 +10,6 @@ spec:
    - name: cluster-apps-cloudnative-pg-cluster
    - name: cluster-apps-external-secrets-stores
  path: ./kubernetes/apps/default/pushover-notifier/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/archive/kubernetes/semaphore/ks.yaml
+++ b/archive/kubernetes/semaphore/ks.yaml
@@ -10,14 +10,6 @@ spec:
    - name: cluster-apps-external-secrets-stores
    - name: cluster-apps-cloudnative-pg-app
  path: ./kubernetes/apps/default/semaphore/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/archive/kubernetes/smartctl-exporter/ks.yaml
+++ b/archive/kubernetes/smartctl-exporter/ks.yaml
@@ -7,14 +7,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/monitoring/smartctl-exporter/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/archive/kubernetes/trivy-system/trivy-operator/ks.yaml
+++ b/archive/kubernetes/trivy-system/trivy-operator/ks.yaml
@@ -7,14 +7,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/trivy-system/trivy-operator/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/archive/kubernetes/vector/ks.yaml
+++ b/archive/kubernetes/vector/ks.yaml
@@ -9,14 +9,6 @@ spec:
  dependsOn:
    - name: cluster-apps-loki-app
  path: ./kubernetes/apps/monitoring/vector/aggregator
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
@@ -35,14 +27,6 @@ spec:
  dependsOn:
    - name: cluster-apps-vector-aggregator
  path: ./kubernetes/apps/monitoring/vector/agent
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/actions-runner-system/actions-runner-controller/ks.yaml
+++ b/kubernetes/apps/actions-runner-system/actions-runner-controller/ks.yaml
@@ -9,14 +9,6 @@ spec:
  dependsOn:
    - name: cluster-apps-external-secrets-stores
  path: ./kubernetes/apps/actions-runner-system/actions-runner-controller/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
@@ -36,14 +28,6 @@ spec:
  dependsOn:
    - name: cluster-apps-actions-runner-controller
  path: ./kubernetes/apps/actions-runner-system/actions-runner-controller/runners
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/cert-manager/cert-manager/ks.yaml
+++ b/kubernetes/apps/cert-manager/cert-manager/ks.yaml
@@ -7,14 +7,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/cert-manager/cert-manager/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
@@ -34,14 +26,6 @@ spec:
    - name: cluster-apps-cert-manager
    - name: cluster-apps-external-secrets-stores
  path: ./kubernetes/apps/cert-manager/cert-manager/webhook-ovh
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/atuin/ks.yaml
+++ b/kubernetes/apps/default/atuin/ks.yaml
@@ -10,14 +10,6 @@ spec:
    - name: cluster-apps-cloudnative-pg-cluster
    - name: cluster-apps-external-secrets-stores
  path: ./kubernetes/apps/default/atuin/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/authelia/ks.yaml
+++ b/kubernetes/apps/default/authelia/ks.yaml
@@ -11,14 +11,6 @@ spec:
    - name: cluster-apps-cloudnative-pg-cluster
    - name: cluster-apps-external-secrets-stores
  path: ./kubernetes/apps/default/authelia/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/babybuddy/ks.yaml
+++ b/kubernetes/apps/default/babybuddy/ks.yaml
@@ -7,14 +7,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/default/babybuddy/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/bazarr/ks.yaml
+++ b/kubernetes/apps/default/bazarr/ks.yaml
@@ -11,14 +11,6 @@ spec:
    - name: cluster-apps-external-secrets-stores
    - name: cluster-apps-volsync-app
  path: ./kubernetes/apps/default/bazarr/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/calibre/ks.yaml
+++ b/kubernetes/apps/default/calibre/ks.yaml
@@ -11,14 +11,6 @@ spec:
    - name: cluster-apps-rook-ceph-cluster
    - name: cluster-apps-volsync-app
  path: ./kubernetes/apps/default/calibre/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/cloudnative-pg/ks.yaml
+++ b/kubernetes/apps/default/cloudnative-pg/ks.yaml
@@ -9,14 +9,6 @@ spec:
  dependsOn:
    - name: cluster-apps-external-secrets-stores
  path: ./kubernetes/apps/default/cloudnative-pg/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
@@ -35,14 +27,6 @@ spec:
  dependsOn:
    - name: cluster-apps-cloudnative-pg-app
  path: ./kubernetes/apps/default/cloudnative-pg/cluster
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/emqx/ks.yaml
+++ b/kubernetes/apps/default/emqx/ks.yaml
@@ -10,14 +10,6 @@ spec:
    - name: cluster-apps-rook-ceph-cluster
    - name: cluster-apps-external-secrets-stores
  path: ./kubernetes/apps/default/emqx/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/flood/ks.yaml
+++ b/kubernetes/apps/default/flood/ks.yaml
@@ -11,14 +11,6 @@ spec:
    - name: cluster-apps-qbittorrent-app
    - name: cluster-apps-volsync-app
  path: ./kubernetes/apps/default/flood/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/freshrss/ks.yaml
+++ b/kubernetes/apps/default/freshrss/ks.yaml
@@ -7,14 +7,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/default/freshrss/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/frigate/ks.yaml
+++ b/kubernetes/apps/default/frigate/ks.yaml
@@ -10,14 +10,6 @@ spec:
    - name: cluster-apps-external-secrets-stores
    - name: cluster-apps-node-feature-discovery-rules
  path: ./kubernetes/apps/default/frigate/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/ghostfolio/ks.yaml
+++ b/kubernetes/apps/default/ghostfolio/ks.yaml
@@ -7,14 +7,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/default/ghostfolio/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/hajimari/ks.yaml
+++ b/kubernetes/apps/default/hajimari/ks.yaml
@@ -7,14 +7,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/default/hajimari/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/home-assistant/ks.yaml
+++ b/kubernetes/apps/default/home-assistant/ks.yaml
@@ -11,14 +11,6 @@ spec:
    - name: cluster-apps-external-secrets-stores
    - name: cluster-apps-volsync-app
  path: ./kubernetes/apps/default/home-assistant/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
@@ -36,14 +28,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/default/home-assistant/code
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/homebox/ks.yaml
+++ b/kubernetes/apps/default/homebox/ks.yaml
@@ -7,14 +7,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/default/homebox/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/homelab/ks.yaml
+++ b/kubernetes/apps/default/homelab/ks.yaml
@@ -7,14 +7,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/default/homelab/minio
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
@@ -33,14 +25,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/default/homelab/opnsense
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
@@ -59,14 +43,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/default/homelab/truenas
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/immich/ks.yaml
+++ b/kubernetes/apps/default/immich/ks.yaml
@@ -10,14 +10,6 @@ spec:
    - name: cluster-apps-cloudnative-pg-cluster
    - name: cluster-apps-external-secrets-stores
  path: ./kubernetes/apps/default/immich/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/invidious/ks.yaml
+++ b/kubernetes/apps/default/invidious/ks.yaml
@@ -7,14 +7,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/default/invidious/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/jellyfin/ks.yaml
+++ b/kubernetes/apps/default/jellyfin/ks.yaml
@@ -11,14 +11,6 @@ spec:
    - name: cluster-apps-external-secrets-stores
    - name: cluster-apps-volsync-app
  path: ./kubernetes/apps/default/jellyfin/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/joplin/ks.yaml
+++ b/kubernetes/apps/default/joplin/ks.yaml
@@ -7,14 +7,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/default/joplin/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/komf/ks.yaml
+++ b/kubernetes/apps/default/komf/ks.yaml
@@ -11,14 +11,6 @@ spec:
    - name: cluster-apps-rook-ceph-cluster
    - name: cluster-apps-volsync-app
  path: ./kubernetes/apps/default/komf/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/komga/ks.yaml
+++ b/kubernetes/apps/default/komga/ks.yaml
@@ -11,14 +11,6 @@ spec:
    - name: cluster-apps-rook-ceph-cluster
    - name: cluster-apps-volsync-app
  path: ./kubernetes/apps/default/komga/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/kresus/ks.yaml
+++ b/kubernetes/apps/default/kresus/ks.yaml
@@ -7,14 +7,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/default/kresus/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/kubernetes-schemas/ks.yaml
+++ b/kubernetes/apps/default/kubernetes-schemas/ks.yaml
@@ -7,14 +7,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/default/kubernetes-schemas/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/libmedium/ks.yaml
+++ b/kubernetes/apps/default/libmedium/ks.yaml
@@ -7,14 +7,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/default/libmedium/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/libreddit/ks.yaml
+++ b/kubernetes/apps/default/libreddit/ks.yaml
@@ -7,14 +7,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/default/libreddit/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/lidarr/ks.yaml
+++ b/kubernetes/apps/default/lidarr/ks.yaml
@@ -11,14 +11,6 @@ spec:
    - name: cluster-apps-rook-ceph-cluster
    - name: cluster-apps-volsync-app
  path: ./kubernetes/apps/default/lidarr/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/linkding/ks.yaml
+++ b/kubernetes/apps/default/linkding/ks.yaml
@@ -7,14 +7,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/default/linkding/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/lldap/ks.yaml
+++ b/kubernetes/apps/default/lldap/ks.yaml
@@ -9,14 +9,6 @@ spec:
  dependsOn:
    - name: cluster-apps-cloudnative-pg-cluster
  path: ./kubernetes/apps/default/lldap/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/lychee/ks.yaml
+++ b/kubernetes/apps/default/lychee/ks.yaml
@@ -7,14 +7,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/default/lychee/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/mailrise/ks.yaml
+++ b/kubernetes/apps/default/mailrise/ks.yaml
@@ -7,14 +7,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/default/mailrise/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/media-browser/ks.yaml
+++ b/kubernetes/apps/default/media-browser/ks.yaml
@@ -11,14 +11,6 @@ spec:
    - name: cluster-apps-rook-ceph-cluster
    - name: cluster-apps-volsync-app
  path: ./kubernetes/apps/default/media-browser/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/music-transcode/ks.yaml
+++ b/kubernetes/apps/default/music-transcode/ks.yaml
@@ -7,14 +7,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/default/music-transcode/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/navidrome/ks.yaml
+++ b/kubernetes/apps/default/navidrome/ks.yaml
@@ -11,14 +11,6 @@ spec:
    - name: cluster-apps-rook-ceph-cluster
    - name: cluster-apps-volsync-app
  path: ./kubernetes/apps/default/navidrome/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/outline/ks.yaml
+++ b/kubernetes/apps/default/outline/ks.yaml
@@ -7,14 +7,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/default/outline/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/paperless/ks.yaml
+++ b/kubernetes/apps/default/paperless/ks.yaml
@@ -7,14 +7,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/default/paperless/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/pgadmin/ks.yaml
+++ b/kubernetes/apps/default/pgadmin/ks.yaml
@@ -7,14 +7,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/default/pgadmin/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/prowlarr/ks.yaml
+++ b/kubernetes/apps/default/prowlarr/ks.yaml
@@ -11,14 +11,6 @@ spec:
    - name: cluster-apps-rook-ceph-cluster
    - name: cluster-apps-volsync-app
  path: ./kubernetes/apps/default/prowlarr/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/pushover-notifier/ks.yaml
+++ b/kubernetes/apps/default/pushover-notifier/ks.yaml
@@ -10,14 +10,6 @@ spec:
    - name: cluster-apps-cloudnative-pg-cluster
    - name: cluster-apps-external-secrets-stores
  path: ./kubernetes/apps/default/pushover-notifier/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/pyload/ks.yaml
+++ b/kubernetes/apps/default/pyload/ks.yaml
@@ -11,14 +11,6 @@ spec:
    - name: cluster-apps-rook-ceph-cluster
    - name: cluster-apps-volsync-app
  path: ./kubernetes/apps/default/pyload/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/qbittorrent/ks.yaml
+++ b/kubernetes/apps/default/qbittorrent/ks.yaml
@@ -10,14 +10,6 @@ spec:
    - name: cluster-apps-rook-ceph-cluster
    - name: cluster-apps-volsync-app
  path: ./kubernetes/apps/default/qbittorrent/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/radarr/ks.yaml
+++ b/kubernetes/apps/default/radarr/ks.yaml
@@ -12,14 +12,6 @@ spec:
    - name: cluster-apps-rook-ceph-cluster
    - name: cluster-apps-volsync-app
  path: ./kubernetes/apps/default/radarr/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/recyclarr/ks.yaml
+++ b/kubernetes/apps/default/recyclarr/ks.yaml
@@ -10,14 +10,6 @@ spec:
    - name: cluster-apps-radarr-app
    - name: cluster-apps-sonarr-app
  path: ./kubernetes/apps/default/recyclarr/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/resilio-sync/ks.yaml
+++ b/kubernetes/apps/default/resilio-sync/ks.yaml
@@ -7,14 +7,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/default/resilio-sync/claude
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
@@ -34,14 +26,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/default/resilio-sync/helene
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/sabnzbd/ks.yaml
+++ b/kubernetes/apps/default/sabnzbd/ks.yaml
@@ -11,14 +11,6 @@ spec:
    - name: cluster-apps-rook-ceph-cluster
    - name: cluster-apps-volsync-app
  path: ./kubernetes/apps/default/sabnzbd/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/sharry/ks.yaml
+++ b/kubernetes/apps/default/sharry/ks.yaml
@@ -7,14 +7,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/default/sharry/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/smtp-relay/ks.yaml
+++ b/kubernetes/apps/default/smtp-relay/ks.yaml
@@ -7,14 +7,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/default/smtp-relay/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  dependsOn:
    - name: cluster-apps-external-secrets-stores
--- a/kubernetes/apps/default/sonarr/ks.yaml
+++ b/kubernetes/apps/default/sonarr/ks.yaml
@@ -11,14 +11,6 @@ spec:
    - name: cluster-apps-rook-ceph-cluster
    - name: cluster-apps-volsync-app
  path: ./kubernetes/apps/default/sonarr/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/tandoor/ks.yaml
+++ b/kubernetes/apps/default/tandoor/ks.yaml
@@ -7,14 +7,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/default/tandoor/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/unifi/ks.yaml
+++ b/kubernetes/apps/default/unifi/ks.yaml
@@ -10,14 +10,6 @@ spec:
    - name: cluster-apps-rook-ceph-cluster
    - name: cluster-apps-volsync-app
  path: ./kubernetes/apps/default/unifi/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/vaultwarden/ks.yaml
+++ b/kubernetes/apps/default/vaultwarden/ks.yaml
@@ -7,14 +7,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/default/vaultwarden/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/vikunja/ks.yaml
+++ b/kubernetes/apps/default/vikunja/ks.yaml
@@ -7,14 +7,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/default/vikunja/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/wallabag/ks.yaml
+++ b/kubernetes/apps/default/wallabag/ks.yaml
@@ -7,14 +7,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/default/wallabag/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/whoogle/ks.yaml
+++ b/kubernetes/apps/default/whoogle/ks.yaml
@@ -7,14 +7,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/default/whoogle/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/zigbee2mqtt/ks.yaml
+++ b/kubernetes/apps/default/zigbee2mqtt/ks.yaml
@@ -11,14 +11,6 @@ spec:
    - name: cluster-apps-rook-ceph-cluster
    - name: cluster-apps-volsync-app
  path: ./kubernetes/apps/default/zigbee2mqtt/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/default/zwave-js-ui/ks.yaml
+++ b/kubernetes/apps/default/zwave-js-ui/ks.yaml
@@ -11,14 +11,6 @@ spec:
    - name: cluster-apps-rook-ceph-cluster
    - name: cluster-apps-volsync-app
  path: ./kubernetes/apps/default/zwave-js-ui/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/flux-system/addons/ks.yaml
+++ b/kubernetes/apps/flux-system/addons/ks.yaml
@@ -7,14 +7,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/flux-system/addons/monitoring
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
@@ -32,14 +24,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/flux-system/addons/notifications
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
@@ -57,14 +41,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/flux-system/addons/webhooks
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/flux-system/weave-gitops/ks.yaml
+++ b/kubernetes/apps/flux-system/weave-gitops/ks.yaml
@@ -7,14 +7,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/flux-system/weave-gitops/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/kube-system/cilium/ks.yaml
+++ b/kubernetes/apps/kube-system/cilium/ks.yaml
@@ -7,14 +7,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/kube-system/cilium/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: false
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/kube-system/descheduler/ks.yaml
+++ b/kubernetes/apps/kube-system/descheduler/ks.yaml
@@ -7,14 +7,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/kube-system/descheduler/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/kube-system/external-secrets/ks.yaml
+++ b/kubernetes/apps/kube-system/external-secrets/ks.yaml
@@ -7,14 +7,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/kube-system/external-secrets/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
@@ -34,14 +26,6 @@ spec:
  dependsOn:
    - name: cluster-apps-external-secrets
  path: ./kubernetes/apps/kube-system/external-secrets/stores
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/kube-system/intel-device-plugin/ks.yaml
+++ b/kubernetes/apps/kube-system/intel-device-plugin/ks.yaml
@@ -7,14 +7,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/kube-system/intel-device-plugin/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
@@ -31,14 +23,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/kube-system/intel-device-plugin/gpu
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
@@ -55,14 +39,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/kube-system/intel-device-plugin/exporter
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/kube-system/k8s-ycl/ks.yaml
+++ b/kubernetes/apps/kube-system/k8s-ycl/ks.yaml
@@ -7,14 +7,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/kube-system/k8s-ycl/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/kube-system/kubelet-csr-approver/ks.yaml
+++ b/kubernetes/apps/kube-system/kubelet-csr-approver/ks.yaml
@@ -7,14 +7,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/kube-system/kubelet-csr-approver/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/kube-system/metrics-server/ks.yaml
+++ b/kubernetes/apps/kube-system/metrics-server/ks.yaml
@@ -7,14 +7,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/kube-system/metrics-server/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/kube-system/node-feature-discovery/ks.yaml
+++ b/kubernetes/apps/kube-system/node-feature-discovery/ks.yaml
@@ -7,14 +7,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/kube-system/node-feature-discovery/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
@@ -33,14 +25,6 @@ spec:
  dependsOn:
    - name: cluster-apps-node-feature-discovery
  path: ./kubernetes/apps/kube-system/node-feature-discovery/rules
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/kube-system/reloader/ks.yaml
+++ b/kubernetes/apps/kube-system/reloader/ks.yaml
@@ -7,14 +7,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/kube-system/reloader/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/kube-system/snapshot-controller/ks.yaml
+++ b/kubernetes/apps/kube-system/snapshot-controller/ks.yaml
@@ -7,14 +7,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/kube-system/snapshot-controller/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/kube-system/spegel/ks.yaml
+++ b/kubernetes/apps/kube-system/spegel/ks.yaml
@@ -7,14 +7,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/kube-system/spegel/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/monitoring/gatus/ks.yaml
+++ b/kubernetes/apps/monitoring/gatus/ks.yaml
@@ -10,14 +10,6 @@ spec:
    - name: cluster-apps-cloudnative-pg-cluster
    - name: cluster-apps-external-secrets-stores
  path: ./kubernetes/apps/monitoring/gatus/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/monitoring/grafana/ks.yaml
+++ b/kubernetes/apps/monitoring/grafana/ks.yaml
@@ -9,14 +9,6 @@ spec:
  dependsOn:
    - name: cluster-apps-cloudnative-pg-app
  path: ./kubernetes/apps/monitoring/grafana/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/monitoring/kube-prometheus-stack/ks.yaml
+++ b/kubernetes/apps/monitoring/kube-prometheus-stack/ks.yaml
@@ -10,14 +10,6 @@ spec:
    - name: cluster-apps-rook-ceph-cluster
    - name: cluster-apps-thanos-app
  path: ./kubernetes/apps/monitoring/kube-prometheus-stack/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/monitoring/loki/ks.yaml
+++ b/kubernetes/apps/monitoring/loki/ks.yaml
@@ -9,14 +9,6 @@ spec:
  dependsOn:
    - name: cluster-apps-external-secrets-stores
  path: ./kubernetes/apps/monitoring/loki/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/monitoring/thanos/ks.yaml
+++ b/kubernetes/apps/monitoring/thanos/ks.yaml
@@ -10,14 +10,6 @@ spec:
    - name: cluster-apps-external-secrets-stores
    - name: cluster-apps-rook-ceph-cluster
  path: ./kubernetes/apps/monitoring/thanos/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/monitoring/vector/ks.yaml
+++ b/kubernetes/apps/monitoring/vector/ks.yaml
@@ -9,14 +9,6 @@ spec:
  dependsOn:
    - name: cluster-apps-external-secrets-stores
  path: ./kubernetes/apps/monitoring/vector
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/networking/external-dns/ks.yaml
+++ b/kubernetes/apps/networking/external-dns/ks.yaml
@@ -7,14 +7,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/networking/external-dns/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/networking/ingress-nginx/ks.yaml
+++ b/kubernetes/apps/networking/ingress-nginx/ks.yaml
@@ -9,14 +9,6 @@ spec:
  dependsOn:
    - name: cluster-apps-cert-manager-webhook-ovh
  path: ./kubernetes/apps/networking/ingress-nginx/certificates
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
@@ -36,14 +28,6 @@ spec:
  dependsOn:
    - name: cluster-apps-ingress-nginx-certificates
  path: ./kubernetes/apps/networking/ingress-nginx/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/networking/k8s-gateway/ks.yaml
+++ b/kubernetes/apps/networking/k8s-gateway/ks.yaml
@@ -7,14 +7,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/networking/k8s-gateway/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/ngnode/landing-page/ks.yaml
+++ b/kubernetes/apps/ngnode/landing-page/ks.yaml
@@ -7,14 +7,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/ngnode/landing-page/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/rook-ceph/rook-ceph/ks.yaml
+++ b/kubernetes/apps/rook-ceph/rook-ceph/ks.yaml
@@ -7,14 +7,6 @@ metadata:
  namespace: flux-system
 spec:
  path: ./kubernetes/apps/rook-ceph/rook-ceph/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
@@ -33,14 +25,6 @@ spec:
  dependsOn:
    - name: cluster-apps-rook-ceph-app
  path: ./kubernetes/apps/rook-ceph/rook-ceph/cluster
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
@@ -59,14 +43,6 @@ spec:
  dependsOn:
    - name: cluster-apps-rook-ceph-cluster
  path: ./kubernetes/apps/rook-ceph/rook-ceph/toolbox
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/volsync/snapscheduler/ks.yaml
+++ b/kubernetes/apps/volsync/snapscheduler/ks.yaml
@@ -9,14 +9,6 @@ spec:
  dependsOn:
    - name: cluster-apps-snapshot-controller
  path: ./kubernetes/apps/volsync/snapscheduler/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
@@ -35,14 +27,6 @@ spec:
  dependsOn:
    - name: cluster-apps-snapscheduler
  path: ./kubernetes/apps/volsync/snapscheduler/schedules
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/apps/volsync/volsync/ks.yaml
+++ b/kubernetes/apps/volsync/volsync/ks.yaml
@@ -9,14 +9,6 @@ spec:
  dependsOn:
    - name: cluster-apps-snapshot-controller
  path: ./kubernetes/apps/volsync/volsync/app
-  postBuild:
-    substituteFrom:
-      - kind: ConfigMap
-        name: cluster-settings
-        optional: false
-      - kind: Secret
-        name: cluster-secrets
-        optional: false
  prune: true
  sourceRef:
    kind: GitRepository
--- a/kubernetes/flux/apps.yaml
+++ b/kubernetes/flux/apps.yaml
@@ -41,4 +41,6 @@ spec:
              - kind: Secret
                name: cluster-secrets
      target:
-        labelSelector: substitution.flux.home.arpa/enabled=true
+        group: kustomize.toolkit.fluxcd.io
+        kind: Kustomization
+        labelSelector: substitution.flux.home.arpa/disabled notin (true)