feat: migrate cluster-settings to component

joryirving · Feb 2, 2025 · fc5466e · fc5466e
1 parent 2327691
commit fc5466e
Show file tree

Hide file tree

Showing 36 changed files with 148 additions and 26 deletions.
diff --git a/kubernetes/main/apps/actions-runner-system/kustomization.yaml b/kubernetes/main/apps/actions-runner-system/kustomization.yaml
@@ -6,5 +6,7 @@ namespace: actions-runner-system
 resources:
   - ./actions-runner-controller/ks.yaml
 components:
+  - ../../components/cluster-vars
   - ../../../shared/meta/components/alerts
+  - ../../../shared/meta/components/global-vars
   - ../../../shared/meta/components/namespace
diff --git a/kubernetes/main/apps/cert-manager/kustomization.yaml b/kubernetes/main/apps/cert-manager/kustomization.yaml
@@ -6,5 +6,7 @@ namespace: cert-manager
 resources:
   - ./cert-manager/ks.yaml
 components:
+  - ../../components/cluster-vars
   - ../../../shared/meta/components/alerts
+  - ../../../shared/meta/components/global-vars
   - ../../../shared/meta/components/namespace
diff --git a/kubernetes/main/apps/database/kustomization.yaml b/kubernetes/main/apps/database/kustomization.yaml
@@ -7,5 +7,7 @@ resources:
   - ./crunchy-postgres/ks.yaml
   - ./dragonfly/ks.yaml
 components:
+  - ../../components/cluster-vars
   - ../../../shared/meta/components/alerts
+  - ../../../shared/meta/components/global-vars
   - ../../../shared/meta/components/namespace
diff --git a/kubernetes/main/apps/default/kustomization.yaml b/kubernetes/main/apps/default/kustomization.yaml
@@ -5,5 +5,7 @@ kind: Kustomization
 namespace: default
 resources: []
 components:
+  - ../../components/cluster-vars
   - ../../../shared/meta/components/alerts
+  - ../../../shared/meta/components/global-vars
   - ../../../shared/meta/components/namespace
diff --git a/kubernetes/main/apps/downloads/kustomization.yaml b/kubernetes/main/apps/downloads/kustomization.yaml
@@ -18,5 +18,7 @@ resources:
   - ./sabnzbd/ks.yaml
   - ./sonarr/ks.yaml
 components:
+  - ../../components/cluster-vars
   - ../../../shared/meta/components/alerts
+  - ../../../shared/meta/components/global-vars
   - ../../../shared/meta/components/namespace
diff --git a/kubernetes/main/apps/external-secrets/kustomization.yaml b/kubernetes/main/apps/external-secrets/kustomization.yaml
@@ -7,5 +7,7 @@ resources:
   - ./external-secrets/ks.yaml
   - ./onepassword/ks.yaml
 components:
+  - ../../components/cluster-vars
   - ../../../shared/meta/components/alerts
+  - ../../../shared/meta/components/global-vars
   - ../../../shared/meta/components/namespace
diff --git a/kubernetes/main/apps/flux-system/kustomization.yaml b/kubernetes/main/apps/flux-system/kustomization.yaml
@@ -6,7 +6,9 @@ namespace: flux-system
 resources:
   - ./flux-operator/ks.yaml
   - ./headlamp/ks.yaml
-  - ./kustomize-mutating-webhook/ks.yaml
+  # - ./kustomize-mutating-webhook/ks.yaml
 components:
+  - ../../components/cluster-vars
   - ../../../shared/meta/components/alerts
+  - ../../../shared/meta/components/global-vars
   - ../../../shared/meta/components/namespace
diff --git a/kubernetes/main/apps/games/kustomization.yaml b/kubernetes/main/apps/games/kustomization.yaml
@@ -8,5 +8,7 @@ resources:
   # - ./palworld/ks.yaml
   # - ./vrising/ks.yaml
 components:
+  - ../../components/cluster-vars
   - ../../../shared/meta/components/alerts
+  - ../../../shared/meta/components/global-vars
   - ../../../shared/meta/components/namespace
diff --git a/kubernetes/main/apps/kube-system/kustomization.yaml b/kubernetes/main/apps/kube-system/kustomization.yaml
@@ -8,5 +8,7 @@ resources:
   - ./coredns/ks.yaml
   - ./metrics-server/ks.yaml
 components:
+  - ../../components/cluster-vars
   - ../../../shared/meta/components/alerts
+  - ../../../shared/meta/components/global-vars
   - ../../../shared/meta/components/namespace
diff --git a/kubernetes/main/apps/kube-tools/kustomization.yaml b/kubernetes/main/apps/kube-tools/kustomization.yaml
@@ -13,5 +13,7 @@ resources:
   - ./spegel/ks.yaml
   - ./system-upgrade-controller/ks.yaml
 components:
+  - ../../components/cluster-vars
   - ../../../shared/meta/components/alerts
+  - ../../../shared/meta/components/global-vars
   - ../../../shared/meta/components/namespace
diff --git a/kubernetes/main/apps/media/kustomization.yaml b/kubernetes/main/apps/media/kustomization.yaml
@@ -15,5 +15,7 @@ resources:
   - ./wizarr/ks.yaml
   - ./your-spotify/ks.yaml
 components:
+  - ../../components/cluster-vars
   - ../../../shared/meta/components/alerts
+  - ../../../shared/meta/components/global-vars
   - ../../../shared/meta/components/namespace
diff --git a/kubernetes/main/apps/network/kustomization.yaml b/kubernetes/main/apps/network/kustomization.yaml
@@ -7,5 +7,7 @@ resources:
   - ./external/ks.yaml
   - ./internal/ks.yaml
 components:
+  - ../../components/cluster-vars
   - ../../../shared/meta/components/alerts
+  - ../../../shared/meta/components/global-vars
   - ../../../shared/meta/components/namespace
diff --git a/kubernetes/main/apps/observability/kustomization.yaml b/kubernetes/main/apps/observability/kustomization.yaml
@@ -14,5 +14,7 @@ resources:
   # Exporters
   - ./exporters
 components:
+  - ../../components/cluster-vars
   - ../../../shared/meta/components/alerts
+  - ../../../shared/meta/components/global-vars
   - ../../../shared/meta/components/namespace
diff --git a/kubernetes/main/apps/rook-ceph/kustomization.yaml b/kubernetes/main/apps/rook-ceph/kustomization.yaml
@@ -6,5 +6,7 @@ namespace: rook-ceph
 resources:
   - ./rook-ceph/ks.yaml
 components:
+  - ../../components/cluster-vars
   - ../../../shared/meta/components/alerts
+  - ../../../shared/meta/components/global-vars
   - ../../../shared/meta/components/namespace
diff --git a/kubernetes/main/apps/security/kustomization.yaml b/kubernetes/main/apps/security/kustomization.yaml
@@ -6,5 +6,7 @@ namespace: security
 resources:
   - ./authentik/ks.yaml
 components:
+  - ../../components/cluster-vars
   - ../../../shared/meta/components/alerts
+  - ../../../shared/meta/components/global-vars
   - ../../../shared/meta/components/namespace
diff --git a/kubernetes/main/apps/self-hosted/kustomization.yaml b/kubernetes/main/apps/self-hosted/kustomization.yaml
@@ -11,5 +11,7 @@ resources:
   - ./paperless/ks.yaml
   - ./redlib/ks.yaml
 components:
+  - ../../components/cluster-vars
   - ../../../shared/meta/components/alerts
+  - ../../../shared/meta/components/global-vars
   - ../../../shared/meta/components/namespace
diff --git a/kubernetes/main/apps/storage/kustomization.yaml b/kubernetes/main/apps/storage/kustomization.yaml
@@ -9,5 +9,7 @@ resources:
   - ./snapshot-controller/ks.yaml
   - ./volsync/ks.yaml
 components:
+  - ../../components/cluster-vars
   - ../../../shared/meta/components/alerts
+  - ../../../shared/meta/components/global-vars
   - ../../../shared/meta/components/namespace
diff --git a/kubernetes/main/flux/cluster/ks.yaml b/kubernetes/main/flux/cluster/ks.yaml
@@ -61,22 +61,32 @@ spec:
     - name: cluster-shared-meta
   interval: 30m
   path: ./kubernetes/main/apps
+  patches:
+    - patch: |-
+        apiVersion: kustomize.toolkit.fluxcd.io/v1
+        kind: Kustomization
+        metadata:
+          name: not-used
+        spec:
+          postBuild:
+            substituteFrom:
+              - kind: ConfigMap
+                name: cluster-settings
+            substituteFrom:
+              - kind: ConfigMap
+                name: cluster-settings-shared
+      target:
+        group: kustomize.toolkit.fluxcd.io
+        kind: Kustomization
+  postBuild:
+    substituteFrom:
+      - kind: ConfigMap
+        name: cluster-settings
   prune: true
   sourceRef:
     kind: GitRepository
     name: flux-system
     namespace: flux-system
   timeout: 5m
   wait: false
-  # patches:
-  #   - # Add Sops decryption to child Kustomizations
-  #     patch: |
-  #       - op: add
-  #         path: /spec/decryption
-  #         value:
-  #           provider: sops
-  #           secretRef:
-  #             name: sops-age
-  #     target:
-  #       group: kustomize.toolkit.fluxcd.io
-  #       kind: Kustomization
+
diff --git a/kubernetes/main/flux/meta/components/cluster-vars/cluster-settings.yaml b/kubernetes/main/flux/meta/components/cluster-vars/cluster-settings.yaml
@@ -0,0 +1,11 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: cluster-settings
+data:
+  CLUSTER: main
+  PVC_VOLSYNC_STORAGECLASS: ceph-block
+  VOLSYNC_SNAPSHOTCLASS: csi-ceph-blockpool
+  VOLSYNC_CACHE_SNAPSHOTCLASS: ceph-block
+  VOLSYNC_STORAGECLASS: ceph-block
diff --git a/kubernetes/main/flux/meta/components/cluster-vars/kustomization.yaml b/kubernetes/main/flux/meta/components/cluster-vars/kustomization.yaml
@@ -0,0 +1,6 @@
+---
+# yaml-language-server: $schema=https://json.schemastore.org/kustomization
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+resources:
+  - ./cluster-settings.yaml
diff --git a/kubernetes/shared/meta/components/global-vars/cluster-settings.yaml b/kubernetes/shared/meta/components/global-vars/cluster-settings.yaml
@@ -0,0 +1,7 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: cluster-settings-shared
+data:
+  SECRET_DOMAIN: jory.dev
diff --git a/kubernetes/shared/meta/components/global-vars/kustomization.yaml b/kubernetes/shared/meta/components/global-vars/kustomization.yaml
@@ -0,0 +1,6 @@
+---
+# yaml-language-server: $schema=https://json.schemastore.org/kustomization
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+resources:
+  - ./cluster-settings.yaml
diff --git a/kubernetes/utility/apps/cert-manager/kustomization.yaml b/kubernetes/utility/apps/cert-manager/kustomization.yaml
@@ -6,5 +6,7 @@ namespace: cert-manager
 resources:
   - ./cert-manager/ks.yaml
 components:
+  - ../../components/cluster-vars
   - ../../../shared/meta/components/alerts
+  - ../../../shared/meta/components/global-vars
   - ../../../shared/meta/components/namespace
diff --git a/kubernetes/utility/apps/default/kustomization.yaml b/kubernetes/utility/apps/default/kustomization.yaml
@@ -5,5 +5,7 @@ kind: Kustomization
 namespace: default
 resources: []
 components:
+  - ../../components/cluster-vars
   - ../../../shared/meta/components/alerts
+  - ../../../shared/meta/components/global-vars
   - ../../../shared/meta/components/namespace
diff --git a/kubernetes/utility/apps/external-secrets/kustomization.yaml b/kubernetes/utility/apps/external-secrets/kustomization.yaml
@@ -7,5 +7,7 @@ resources:
   - ./external-secrets/ks.yaml
   - ./onepassword/ks.yaml
 components:
+  - ../../components/cluster-vars
   - ../../../shared/meta/components/alerts
+  - ../../../shared/meta/components/global-vars
   - ../../../shared/meta/components/namespace
diff --git a/kubernetes/utility/apps/flux-system/kustomization.yaml b/kubernetes/utility/apps/flux-system/kustomization.yaml
@@ -6,8 +6,10 @@ namespace: flux-system
 resources:
   - ./flux-operator/ks.yaml
   - ./headlamp/ks.yaml
-  - ./kustomize-mutating-webhook/ks.yaml
+  # - ./kustomize-mutating-webhook/ks.yaml
   - ./tofu-controller/ks.yaml
 components:
+  - ../../components/cluster-vars
   - ../../../shared/meta/components/alerts
+  - ../../../shared/meta/components/global-vars
   - ../../../shared/meta/components/namespace
diff --git a/kubernetes/utility/apps/home-automation/kustomization.yaml b/kubernetes/utility/apps/home-automation/kustomization.yaml
@@ -9,5 +9,7 @@ resources:
   - ./rtlamr2mqtt/ks.yaml
   - ./zigbee2mqtt/ks.yaml
 components:
+  - ../../components/cluster-vars
   - ../../../shared/meta/components/alerts
+  - ../../../shared/meta/components/global-vars
   - ../../../shared/meta/components/namespace
diff --git a/kubernetes/utility/apps/kube-system/kustomization.yaml b/kubernetes/utility/apps/kube-system/kustomization.yaml
@@ -8,5 +8,7 @@ resources:
   - ./coredns/ks.yaml
   - ./metrics-server/ks.yaml
 components:
+  - ../../components/cluster-vars
   - ../../../shared/meta/components/alerts
+  - ../../../shared/meta/components/global-vars
   - ../../../shared/meta/components/namespace
diff --git a/kubernetes/utility/apps/kube-tools/kustomization.yaml b/kubernetes/utility/apps/kube-tools/kustomization.yaml
@@ -10,5 +10,7 @@ resources:
   - ./reloader/ks.yaml
   - ./system-upgrade-controller/ks.yaml
 components:
+  - ../../components/cluster-vars
   - ../../../shared/meta/components/alerts
+  - ../../../shared/meta/components/global-vars
   - ../../../shared/meta/components/namespace
diff --git a/kubernetes/utility/apps/network/kustomization.yaml b/kubernetes/utility/apps/network/kustomization.yaml
@@ -7,5 +7,7 @@ resources:
   - ./external/ks.yaml
   - ./internal/ks.yaml
 components:
+  - ../../components/cluster-vars
   - ../../../shared/meta/components/alerts
+  - ../../../shared/meta/components/global-vars
   - ../../../shared/meta/components/namespace
diff --git a/kubernetes/utility/apps/observability/kustomization.yaml b/kubernetes/utility/apps/observability/kustomization.yaml
@@ -10,5 +10,7 @@ resources:
   - ./network-ups-tools/ks.yaml
   - ./smartctl-exporter/ks.yaml
 components:
+  - ../../components/cluster-vars
   - ../../../shared/meta/components/alerts
+  - ../../../shared/meta/components/global-vars
   - ../../../shared/meta/components/namespace
diff --git a/kubernetes/utility/apps/self-hosted/kustomization.yaml b/kubernetes/utility/apps/self-hosted/kustomization.yaml
@@ -10,5 +10,7 @@ resources:
   - ./rss-forwarder/ks.yaml
   - ./thelounge/ks.yaml
 components:
+  - ../../components/cluster-vars
   - ../../../shared/meta/components/alerts
+  - ../../../shared/meta/components/global-vars
   - ../../../shared/meta/components/namespace
diff --git a/kubernetes/utility/apps/storage/kustomization.yaml b/kubernetes/utility/apps/storage/kustomization.yaml
@@ -8,5 +8,7 @@ resources:
   - ./snapshot-controller/ks.yaml
   - ./volsync/ks.yaml
 components:
+  - ../../components/cluster-vars
   - ../../../shared/meta/components/alerts
+  - ../../../shared/meta/components/global-vars
   - ../../../shared/meta/components/namespace
diff --git a/kubernetes/utility/flux/cluster/ks.yaml b/kubernetes/utility/flux/cluster/ks.yaml
@@ -61,22 +61,31 @@ spec:
     - name: cluster-shared-meta
   interval: 30m
   path: ./kubernetes/utility/apps
+  patches:
+    - patch: |-
+        apiVersion: kustomize.toolkit.fluxcd.io/v1
+        kind: Kustomization
+        metadata:
+          name: not-used
+        spec:
+          postBuild:
+            substituteFrom:
+              - kind: ConfigMap
+                name: cluster-settings
+            substituteFrom:
+              - kind: ConfigMap
+                name: cluster-settings-shared
+      target:
+        group: kustomize.toolkit.fluxcd.io
+        kind: Kustomization
+  postBuild:
+    substituteFrom:
+      - kind: ConfigMap
+        name: cluster-settings
   prune: true
   sourceRef:
     kind: GitRepository
     name: flux-system
     namespace: flux-system
   timeout: 5m
   wait: false
-  # patches:
-  #   - # Add Sops decryption to child Kustomizations
-  #     patch: |
-  #       - op: add
-  #         path: /spec/decryption
-  #         value:
-  #           provider: sops
-  #           secretRef:
-  #             name: sops-age
-  #     target:
-  #       group: kustomize.toolkit.fluxcd.io
-  #       kind: Kustomization
diff --git a/kubernetes/utility/flux/meta/components/cluster-vars/cluster-settings.yaml b/kubernetes/utility/flux/meta/components/cluster-vars/cluster-settings.yaml
@@ -0,0 +1,11 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: cluster-settings
+data:
+  CLUSTER: utility
+  PVC_VOLSYNC_STORAGECLASS: local-hostpath
+  VOLSYNC_SNAPSHOTCLASS: csi-local-hostpath
+  VOLSYNC_CACHE_SNAPSHOTCLASS: local-hostpath
+  VOLSYNC_STORAGECLASS: local-hostpath
diff --git a/kubernetes/utility/flux/meta/components/cluster-vars/kustomization.yaml b/kubernetes/utility/flux/meta/components/cluster-vars/kustomization.yaml
@@ -0,0 +1,6 @@
+---
+# yaml-language-server: $schema=https://json.schemastore.org/kustomization
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+resources:
+  - ./cluster-settings.yaml