feat: uncomment from taskfile

joryirving · Jan 24, 2025 · 4bafbc7 · 4bafbc7
1 parent b2812f9
commit 4bafbc7
Show file tree

Hide file tree

Showing 11 changed files with 102 additions and 46 deletions.
diff --git a/.taskfiles/bootstrap/Taskfile.yaml b/.taskfiles/bootstrap/Taskfile.yaml
@@ -73,7 +73,7 @@ tasks:
     desc: Bootstrap Apps [CLUSTER=main]
     prompt: Bootstrap apps into the Talos cluster?
     cmds:
-      # - until kubectl wait nodes --for=condition=Ready=False --all --timeout=10m; do sleep 5; done
+      - 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

diff --git a/kubernetes/main/apps/flux-system/kustomize-mutating-webhook/app/helm-values.yaml b/kubernetes/main/apps/flux-system/kustomize-mutating-webhook/app/helm-values.yaml
@@ -0,0 +1,13 @@
+---
+certManager:
+  enabled: true
+configMaps:
+  - create: true
+    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
+secrets: []
diff --git a/kubernetes/main/apps/flux-system/kustomize-mutating-webhook/app/helmrelease.yaml b/kubernetes/main/apps/flux-system/kustomize-mutating-webhook/app/helmrelease.yaml
@@ -23,16 +23,6 @@ spec:
     remediation:
       strategy: rollback
       retries: 3
-  values:
-    certManager:
-      enabled: true
-    configMaps:
-      - create: true
-        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
-    secrets: []
+  valuesFrom:
+    - kind: ConfigMap
+      name: kustomize-mutating-webhook-helm-values
diff --git a/kubernetes/main/apps/flux-system/kustomize-mutating-webhook/app/kustomization.yaml b/kubernetes/main/apps/flux-system/kustomize-mutating-webhook/app/kustomization.yaml
@@ -4,3 +4,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ./helmrelease.yaml
+configMapGenerator:
+  - name: kustomize-mutating-webhook-helm-values
+    files:
+      - values.yaml=./helm-values.yaml
+configurations:
+  - kustomizeconfig.yaml
diff --git a/kubernetes/main/apps/flux-system/kustomize-mutating-webhook/app/kustomizeconfig.yaml b/kubernetes/main/apps/flux-system/kustomize-mutating-webhook/app/kustomizeconfig.yaml
@@ -0,0 +1,7 @@
+---
+nameReference:
+  - kind: ConfigMap
+    version: v1
+    fieldSpecs:
+      - path: spec/valuesFrom/name
+        kind: HelmRelease
diff --git a/kubernetes/main/bootstrap/apps/helmfile.yaml b/kubernetes/main/bootstrap/apps/helmfile.yaml
@@ -17,6 +17,9 @@ repositories:
   - name: jetstack
     url: https://charts.jetstack.io
 
+  - name: fluxcd-kustomize-mutating-webhook
+    url: https://xunholy.github.io/fluxcd-kustomize-mutating-webhook
+
 releases:
   - name: kube-prometheus-stack-crds
     namespace: observability
@@ -28,7 +31,7 @@ releases:
     chart: cilium/cilium
     version: 1.16.6
     values:
-      - ../apps/kube-system/cilium/app/helm-values.yaml
+      - ../../apps/kube-system/cilium/app/helm-values.yaml
     needs:
       - observability/kube-prometheus-stack-crds
 
@@ -37,7 +40,7 @@ releases:
     chart: coredns/coredns
     version: 1.37.3
     values:
-      - ../apps/kube-system/coredns/app/helm-values.yaml
+      - ../../apps/kube-system/coredns/app/helm-values.yaml
     needs:
       - kube-system/cilium
 
@@ -46,16 +49,25 @@ releases:
     chart: jetstack/cert-manager
     version: v1.16.3
     values:
-      - ../apps/cert-manager/cert-manager/app/helm-values.yaml
+      - ../../apps/cert-manager/cert-manager/app/helm-values.yaml
     needs:
       - kube-system/coredns
 
   - name: external-secrets
     namespace: external-secrets
-    chart: oci://ghcr.io/external-secrets/charts
-    version: 0.12.1
+    chart: oci://ghcr.io/external-secrets/charts/external-secrets
+    version: 0.13.0
+    values:
+      - ../../apps/external-secrets/external-secrets/app/helm-values.yaml
+    needs:
+      - kube-system/coredns
+
+  - name: kustomize-mutating-webhook
+    namespace: flux-system
+    chart: fluxcd-kustomize-mutating-webhook/kustomize-mutating-webhook
+    version: 0.13.0
     values:
-      - ../apps/external-secrets/external-secrets/app/helm-values.yaml
+      - ../../apps/flux-system/kustomize-mutating-webhook/app/helm-values.yaml
     needs:
       - kube-system/coredns
 
@@ -73,7 +85,7 @@ releases:
     chart: oci://ghcr.io/controlplaneio-fluxcd/charts/flux-operator
     version: 0.13.0
     values:
-      - ../apps/flux-system/flux-operator/app/helm-values.yaml
+      - ../../apps/flux-system/flux-operator/app/helm-values.yaml
     needs:
       - kube-system/wipe-rook
 
@@ -83,6 +95,6 @@ releases:
     version: 0.13.0
     wait: false
     values:
-      - ../apps/flux-system/flux-operator/instance/helm-values.yaml
+      - ../../apps/flux-system/flux-operator/instance/helm-values.yaml
     needs:
       - flux-system/flux-operator
diff --git a/kubernetes/utility/apps/flux-system/kustomize-mutating-webhook/app/helm-values.yaml b/kubernetes/utility/apps/flux-system/kustomize-mutating-webhook/app/helm-values.yaml
@@ -0,0 +1,16 @@
+---
+replicaCount: 1
+certManager:
+  enabled: true
+configMaps:
+  - create: true
+    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
+secrets: []
+podDisruptionBudget:
+  enabled: false #single node cluster
diff --git a/kubernetes/utility/apps/flux-system/kustomize-mutating-webhook/app/helmrelease.yaml b/kubernetes/utility/apps/flux-system/kustomize-mutating-webhook/app/helmrelease.yaml
@@ -23,19 +23,6 @@ spec:
     remediation:
       strategy: rollback
       retries: 3
-  values:
-    replicaCount: 1
-    certManager:
-      enabled: true
-    configMaps:
-      - create: true
-        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
-    secrets: []
-    podDisruptionBudget:
-      enabled: false #single node cluster
+  valuesFrom:
+    - kind: ConfigMap
+      name: kustomize-mutating-webhook-helm-values
diff --git a/kubernetes/utility/apps/flux-system/kustomize-mutating-webhook/app/kustomization.yaml b/kubernetes/utility/apps/flux-system/kustomize-mutating-webhook/app/kustomization.yaml
@@ -4,3 +4,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ./helmrelease.yaml
+configMapGenerator:
+  - name: kustomize-mutating-webhook-helm-values
+    files:
+      - values.yaml=./helm-values.yaml
+configurations:
+  - kustomizeconfig.yaml
diff --git a/kubernetes/utility/apps/flux-system/kustomize-mutating-webhook/app/kustomizeconfig.yaml b/kubernetes/utility/apps/flux-system/kustomize-mutating-webhook/app/kustomizeconfig.yaml
@@ -0,0 +1,7 @@
+---
+nameReference:
+  - kind: ConfigMap
+    version: v1
+    fieldSpecs:
+      - path: spec/valuesFrom/name
+        kind: HelmRelease
diff --git a/kubernetes/utility/bootstrap/apps/helmfile.yaml b/kubernetes/utility/bootstrap/apps/helmfile.yaml
@@ -17,6 +17,9 @@ repositories:
   - name: jetstack
     url: https://charts.jetstack.io
 
+  - name: fluxcd-kustomize-mutating-webhook
+    url: https://xunholy.github.io/fluxcd-kustomize-mutating-webhook
+
 releases:
   - name: kube-prometheus-stack-crds
     namespace: observability
@@ -28,7 +31,7 @@ releases:
     chart: cilium/cilium
     version: 1.16.6
     values:
-      - ../apps/kube-system/cilium/app/helm-values.yaml
+      - ../../apps/kube-system/cilium/app/helm-values.yaml
     needs:
       - observability/kube-prometheus-stack-crds
 
@@ -37,7 +40,7 @@ releases:
     chart: coredns/coredns
     version: 1.37.3
     values:
-      - ../apps/kube-system/coredns/app/helm-values.yaml
+      - ../../apps/kube-system/coredns/app/helm-values.yaml
     needs:
       - kube-system/cilium
 
@@ -46,16 +49,25 @@ releases:
     chart: jetstack/cert-manager
     version: v1.16.3
     values:
-      - ../apps/cert-manager/cert-manager/app/helm-values.yaml
+      - ../../apps/cert-manager/cert-manager/app/helm-values.yaml
     needs:
       - kube-system/coredns
 
   - name: external-secrets
     namespace: external-secrets
-    chart: oci://ghcr.io/external-secrets/charts
-    version: 0.12.1
+    chart: oci://ghcr.io/external-secrets/charts/external-secrets
+    version: 0.13.0
+    values:
+      - ../../apps/external-secrets/external-secrets/app/helm-values.yaml
+    needs:
+      - kube-system/coredns
+
+  - name: kustomize-mutating-webhook
+    namespace: flux-system
+    chart: fluxcd-kustomize-mutating-webhook/kustomize-mutating-webhook
+    version: 0.13.0
     values:
-      - ../apps/external-secrets/external-secrets/app/helm-values.yaml
+      - ../../apps/flux-system/kustomize-mutating-webhook/app/helm-values.yaml
     needs:
       - kube-system/coredns
 
@@ -73,7 +85,7 @@ releases:
     chart: oci://ghcr.io/controlplaneio-fluxcd/charts/flux-operator
     version: 0.13.0
     values:
-      - ../apps/flux-system/flux-operator/app/helm-values.yaml
+      - ../../apps/flux-system/flux-operator/app/helm-values.yaml
     needs:
       - kube-system/wipe-rook
 
@@ -83,6 +95,6 @@ releases:
     version: 0.13.0
     wait: false
     values:
-      - ../apps/flux-system/flux-operator/instance/helm-values.yaml
+      - ../../apps/flux-system/flux-operator/instance/helm-values.yaml
     needs:
       - flux-system/flux-operator