refactor: kube-system

kubernetes/apps/flux-system/repositories/helm/bjw-s.yaml

@@ -1,10 +0,0 @@
----
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/helmrepository_v1.json
-apiVersion: source.toolkit.fluxcd.io/v1
-kind: HelmRepository
-metadata:
-  name: bjw-s
-  namespace: flux-system
-spec:
-  interval: 2h
-  url: https://bjw-s.github.io/helm-charts/

kubernetes/apps/flux-system/repositories/helm/cilium.yaml

@@ -1,10 +0,0 @@
----
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/helmrepository_v1.json
-apiVersion: source.toolkit.fluxcd.io/v1
-kind: HelmRepository
-metadata:
-  name: cilium
-  namespace: flux-system
-spec:
-  interval: 2h
-  url: https://helm.cilium.io

kubernetes/apps/flux-system/repositories/helm/coredns.yaml

@@ -1,10 +0,0 @@
----
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/helmrepository_v1.json
-apiVersion: source.toolkit.fluxcd.io/v1
-kind: HelmRepository
-metadata:
-  name: coredns
-  namespace: flux-system
-spec:
-  interval: 1h
-  url: https://coredns.github.io/helm

kubernetes/apps/flux-system/repositories/helm/descheduler.yaml

@@ -1,10 +0,0 @@
----
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/helmrepository_v1.json
-apiVersion: source.toolkit.fluxcd.io/v1
-kind: HelmRepository
-metadata:
-  name: descheduler
-  namespace: flux-system
-spec:
-  interval: 2h
-  url: https://kubernetes-sigs.github.io/descheduler

kubernetes/apps/flux-system/repositories/helm/gitea.yaml

@@ -1,11 +0,0 @@
----
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/helmrepository_v1.json
-apiVersion: source.toolkit.fluxcd.io/v1
-kind: HelmRepository
-metadata:
-  name: gitea
-  namespace: flux-system
-spec:
-  interval: 2h
-  url: https://dl.gitea.io/charts
-  timeout: 3m

kubernetes/apps/flux-system/repositories/helm/intel.yaml

@@ -1,10 +0,0 @@
----
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/helmrepository_v1.json
-apiVersion: source.toolkit.fluxcd.io/v1
-kind: HelmRepository
-metadata:
-  name: intel
-  namespace: flux-system
-spec:
-  interval: 2h
-  url: https://intel.github.io/helm-charts

kubernetes/apps/flux-system/repositories/helm/kustomization.yaml

@@ -6,35 +6,23 @@ resources:
   - ./actions-runner-controller.yaml
   - ./aqua.yaml
   - ./backube.yaml
-  - ./bjw-s.yaml
   - ./cert-manager-webhook-ovh.yaml
-  - ./cilium.yaml
   - ./cloudnative-pg.yaml
-  - ./coredns.yaml
   - ./crunchydata.yaml
   - ./crowdsec.yaml
-  - ./descheduler.yaml
   - ./dysnix.yaml
   - ./emxq.yaml
   - ./external-dns.yaml
   - ./external-secrets.yaml
-  - ./gitea.yaml
   - ./grafana.yaml
   - ./hajimari.yaml
   - ./ingress-nginx.yaml
-  - ./intel.yaml
   - ./jetstack.yaml
   - ./k8s-gateway.yaml
   - ./kyverno.yaml
-  - ./metrics-server.yaml
-  - ./node-feature-discovery.yaml
   - ./openebs.yaml
   - ./piraeus.yaml
   - ./postfinance.yaml
   - ./prometheus-community.yaml
   - ./rook-ceph.yaml
-  - ./spegel.yaml
-  - ./stakater.yaml
   - ./stevehipwell.yaml
-  - ./vector.yaml
-  - ./windmill.yaml

kubernetes/apps/flux-system/repositories/helm/metrics-server.yaml

@@ -1,10 +0,0 @@
----
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/helmrepository_v1.json
-apiVersion: source.toolkit.fluxcd.io/v1
-kind: HelmRepository
-metadata:
-  name: metrics-server
-  namespace: flux-system
-spec:
-  interval: 2h
-  url: https://kubernetes-sigs.github.io/metrics-server

kubernetes/apps/flux-system/repositories/helm/node-feature-discovery.yaml

@@ -1,11 +0,0 @@
----
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/helmrepository_v1.json
-apiVersion: source.toolkit.fluxcd.io/v1
-kind: HelmRepository
-metadata:
-  name: node-feature-discovery
-  namespace: flux-system
-spec:
-  interval: 2h
-  url: https://kubernetes-sigs.github.io/node-feature-discovery/charts
-  timeout: 3m

kubernetes/apps/flux-system/repositories/helm/spegel.yaml

@@ -1,11 +0,0 @@
----
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/helmrepository_v1.json
-apiVersion: source.toolkit.fluxcd.io/v1
-kind: HelmRepository
-metadata:
-  name: spegel
-  namespace: flux-system
-spec:
-  type: oci
-  interval: 2h
-  url: oci://ghcr.io/spegel-org/helm-charts

kubernetes/apps/flux-system/repositories/helm/stakater.yaml

@@ -1,11 +0,0 @@
----
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/helmrepository_v1.json
-apiVersion: source.toolkit.fluxcd.io/v1
-kind: HelmRepository
-metadata:
-  name: stakater
-  namespace: flux-system
-spec:
-  interval: 2h
-  url: https://stakater.github.io/stakater-charts
-  timeout: 3m

kubernetes/apps/flux-system/repositories/helm/vector.yaml

@@ -1,10 +0,0 @@
----
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/helmrepository_v1.json
-apiVersion: source.toolkit.fluxcd.io/v1
-kind: HelmRepository
-metadata:
-  name: vector
-  namespace: flux-system
-spec:
-  interval: 2h
-  url: https://helm.vector.dev

kubernetes/apps/flux-system/repositories/helm/windmill.yaml

@@ -1,10 +0,0 @@
----
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/helmrepository_v1beta2.json
-apiVersion: source.toolkit.fluxcd.io/v1
-kind: HelmRepository
-metadata:
-  name: windmill
-  namespace: flux-system
-spec:
-  interval: 2h
-  url: https://windmill-labs.github.io/windmill-helm-charts/

kubernetes/apps/kube-system/descheduler/app/helmrelease.yaml

@@ -1,4 +1,18 @@
 ---
+# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/ocirepository_v1.json
+apiVersion: source.toolkit.fluxcd.io/v1
+kind: OCIRepository
+metadata:
+  name: descheduler
+spec:
+  interval: 5m
+  layerSelector:
+    mediaType: application/vnd.cncf.helm.chart.content.v1.tar+gzip
+    operation: copy
+  ref:
+    tag: 0.33.0
+  url: oci://ghcr.io/home-operations/charts-mirror/descheduler
+---
 # yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/helm.toolkit.fluxcd.io/helmrelease_v2.json
 apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
@@ -6,25 +20,17 @@ metadata:
   name: &app descheduler
   namespace: kube-system
 spec:
-  interval: 30m
+  interval: 1h
-  chart:
+  chartRef:
-    spec:
+    kind: OCIRepository
-      chart: *app
+    name: descheduler
-      version: 0.33.0
-      sourceRef:
-        kind: HelmRepository
-        name: descheduler
-        namespace: flux-system
-  maxHistory: 2
   install:
     remediation:
-      retries: 3
+      retries: -1
   upgrade:
     cleanupOnFail: true
     remediation:
       retries: 3
-  uninstall:
-    keepHistory: false
   values:
     replicas: 2
     kind: Deployment

kubernetes/apps/kube-system/descheduler/ks.yaml

@@ -11,9 +11,6 @@ spec:
       app.kubernetes.io/name: *app
   interval: 1h
   path: ./kubernetes/apps/kube-system/descheduler/app
-  postBuild:
-    substitute:
-      APP: *app
   prune: true
   retryInterval: 2m
   sourceRef:

kubernetes/apps/kube-system/fstrim/app/helmrelease.yaml

@@ -1,68 +0,0 @@
----
-# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/charts/other/app-template/schemas/helmrelease-helm-v2.schema.json
-apiVersion: helm.toolkit.fluxcd.io/v2
-kind: HelmRelease
-metadata:
-  name: &app fstrim
-spec:
-  interval: 1h
-  chartRef:
-    kind: OCIRepository
-    name: app-template
-    namespace: flux-system
-  install:
-    remediation:
-      retries: 3
-  upgrade:
-    cleanupOnFail: true
-    remediation:
-      strategy: rollback
-      retries: 3
-  values:
-    controllers:
-      fstrim:
-        type: cronjob
-        cronjob:
-          schedule: 0 0 * * 0
-          parallelism: 4 # Set to total number of nodes
-          successfulJobsHistory: 1
-          failedJobsHistory: 1
-        containers:
-          app:
-            image:
-              repository: ghcr.io/onedr0p/kubanetics
-              tag: 2025.3.2@sha256:309a7587c2aa7ce6a99812a61c5024240a21b708f94802a09105c61513572164
-            env:
-              SCRIPT_NAME: fstrim.sh
-            resources:
-              requests:
-                cpu: 25m
-              limits:
-                memory: 128Mi
-            securityContext:
-              privileged: true
-    defaultPodOptions:
-      hostNetwork: true
-      hostPID: true
-      topologySpreadConstraints:
-        - maxSkew: 1
-          topologyKey: kubernetes.io/hostname
-          whenUnsatisfiable: DoNotSchedule
-          labelSelector:
-            matchLabels:
-              app.kubernetes.io/name: *app
-    persistence:
-      procfs:
-        type: hostPath
-        hostPath: /proc
-        hostPathType: Directory
-        globalMounts:
-          - path: /host/proc
-            readOnly: true
-      netfs:
-        type: hostPath
-        hostPath: /sys
-        hostPathType: Directory
-        globalMounts:
-          - path: /host/net
-            readOnly: true

kubernetes/apps/kube-system/fstrim/app/kustomization.yaml

@@ -1,6 +0,0 @@
----
-# yaml-language-server: $schema=https://json.schemastore.org/kustomization
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  - ./helmrelease.yaml

kubernetes/apps/kube-system/fstrim/ks.yaml

@@ -1,25 +0,0 @@
----
-# 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: &app fstrim
-  namespace: &namespace kube-system
-spec:
-  commonMetadata:
-    labels:
-      app.kubernetes.io/name: *app
-  interval: 1h
-  path: ./kubernetes/apps/kube-system/fstrim/app
-  postBuild:
-    substitute:
-      APP: *app
-  prune: true
-  retryInterval: 2m
-  sourceRef:
-    kind: GitRepository
-    name: home-ops-kubernetes
-    namespace: flux-system
-  targetNamespace: *namespace
-  timeout: 5m
-  wait: false

kubernetes/apps/kube-system/intel-device-plugin/app/helmrelease.yaml

@@ -1,32 +1,38 @@
 ---
+# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/ocirepository_v1.json
+apiVersion: source.toolkit.fluxcd.io/v1
+kind: OCIRepository
+metadata:
+  name: intel-device-plugins-operator
+spec:
+  interval: 5m
+  layerSelector:
+    mediaType: application/vnd.cncf.helm.chart.content.v1.tar+gzip
+    operation: copy
+  ref:
+    tag: 0.32.1
+  url: oci://ghcr.io/home-operations/charts-mirror/intel-device-plugins-operator
+---
 # yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/helm.toolkit.fluxcd.io/helmrelease_v2.json
 apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: intel-device-plugin-operator
-  namespace: kube-system
 spec:
-  interval: 30m
+  interval: 1h
-  chart:
+  chartRef:
-    spec:
+    kind: OCIRepository
-      chart: intel-device-plugins-operator
+    name: intel-device-plugins-operator
-      version: 0.32.1
-      sourceRef:
-        kind: HelmRepository
-        name: intel
-        namespace: flux-system
-  maxHistory: 2
   install:
     crds: CreateReplace
     remediation:
-      retries: 3
+      retries: -1
   upgrade:
     cleanupOnFail: true
     crds: CreateReplace
     remediation:
       retries: 3
-  uninstall:
+  values:
-    keepHistory: false
+    manager:
-  dependsOn:
+      devices:
-    - name: node-feature-discovery
+        gpu: true
-      namespace: kube-system

kubernetes/apps/kube-system/intel-device-plugin/gpu/helmrelease.yaml

@@ -1,34 +1,36 @@
 ---
+# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/ocirepository_v1.json
+apiVersion: source.toolkit.fluxcd.io/v1
+kind: OCIRepository
+metadata:
+  name: intel-device-plugins-gpu
+spec:
+  interval: 5m
+  layerSelector:
+    mediaType: application/vnd.cncf.helm.chart.content.v1.tar+gzip
+    operation: copy
+  ref:
+    tag: 0.32.1
+  url: oci://ghcr.io/home-operations/charts-mirror/intel-device-plugins-gpu
+---
 # yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/helm.toolkit.fluxcd.io/helmrelease_v2.json
 apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: intel-device-plugin-gpu
-  namespace: kube-system
 spec:
-  interval: 30m
+  interval: 1h
-  chart:
+  chartRef:
-    spec:
+    kind: OCIRepository
-      chart: intel-device-plugins-gpu
+    name: intel-device-plugins-gpu
-      version: 0.32.1
-      sourceRef:
-        kind: HelmRepository
-        name: intel
-        namespace: flux-system
-  maxHistory: 2
   install:
     remediation:
-      retries: 3
+      retries: -1
   upgrade:
     cleanupOnFail: true
     remediation:
       retries: 3
-  uninstall:
-    keepHistory: false
-  dependsOn:
-    - name: intel-device-plugin-operator
-      namespace: kube-system
   values:
-    name: intel-device-plugin-gpu
+    name: i915
-    sharedDevNum: 3
     nodeFeatureRule: false
+    sharedDevNum: 99

kubernetes/apps/kube-system/intel-device-plugin/ks.yaml

@@ -3,7 +3,7 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: &app intel-device-plugin
+  name: &app intel-device-plugin-operator
   namespace: &namespace kube-system
 spec:
   commonMetadata:
@@ -11,9 +11,6 @@ spec:
       app.kubernetes.io/name: *app
   interval: 1h
   path: ./kubernetes/apps/kube-system/intel-device-plugin/app
-  postBuild:
-    substitute:
-      APP: *app
   prune: true
   retryInterval: 2m
   sourceRef:
@@ -34,11 +31,24 @@ spec:
   commonMetadata:
     labels:
       app.kubernetes.io/name: *app
+  dependsOn:
+    - name: intel-device-plugin-operator
+      namespace: *namespace
+  healthChecks:
+    - apiVersion: helm.toolkit.fluxcd.io/v2
+      kind: HelmRelease
+      name: *app
+      namespace: *namespace
+    - apiVersion: deviceplugin.intel.com/v1
+      kind: GpuDevicePlugin
+      name: i915
+  healthCheckExprs:
+    - apiVersion: deviceplugin.intel.com/v1
+      kind: GpuDevicePlugin
+      failed: status.desiredNumberScheduled != status.numberReady
+      current: status.desiredNumberScheduled == status.numberReady
   interval: 1h
   path: ./kubernetes/apps/kube-system/intel-device-plugin/gpu
-  postBuild:
-    substitute:
-      APP: *app
   prune: true
   retryInterval: 2m
   sourceRef:

kubernetes/apps/kube-system/kubelet-csr-approver/app/helmrelease.yaml

@@ -1,4 +1,18 @@
 ---
+# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/ocirepository_v1.json
+apiVersion: source.toolkit.fluxcd.io/v1
+kind: OCIRepository
+metadata:
+  name: kubelet-csr-approver
+spec:
+  interval: 5m
+  layerSelector:
+    mediaType: application/vnd.cncf.helm.chart.content.v1.tar+gzip
+    operation: copy
+  ref:
+    tag: 1.2.10
+  url: oci://ghcr.io/postfinance/charts/kubelet-csr-approver
+---
 # yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/helm.toolkit.fluxcd.io/helmrelease_v2.json
 apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
@@ -6,14 +20,9 @@ metadata:
   name: kubelet-csr-approver
 spec:
   interval: 30m
-  chart:
+  chartRef:
-    spec:
+    kind: OCIRepository
-      chart: kubelet-csr-approver
+    name: kubelet-csr-approver
-      version: 1.2.10
-      sourceRef:
-        kind: HelmRepository
-        name: postfinance
-        namespace: flux-system
   install:
     remediation:
       retries: 3

kubernetes/apps/kube-system/kubelet-csr-approver/app/kustomization.yaml

@@ -5,8 +5,8 @@ kind: Kustomization
 resources:
   - ./helmrelease.yaml
 configMapGenerator:
-  - name: kubelet-csr-approver-helm-values
+  - name: kubelet-csr-approver-values
     files:
-      - values.yaml=./helm-values.yaml
+      - values.yaml=./helm/values.yaml
 configurations:
-  - kustomizeconfig.yaml
+  - ./helm/kustomizeconfig.yaml

kubernetes/apps/kube-system/kubelet-csr-approver/ks.yaml

@@ -11,9 +11,6 @@ spec:
       app.kubernetes.io/name: *app
   interval: 1h
   path: ./kubernetes/apps/kube-system/kubelet-csr-approver/app
-  postBuild:
-    substitute:
-      APP: *app
   prune: true
   retryInterval: 2m
   sourceRef:

kubernetes/apps/kube-system/kustomization.yaml

@@ -9,7 +9,6 @@ resources:
   - ./cilium/ks.yaml
   - ./coredns/ks.yaml
   - ./descheduler/ks.yaml
-  - ./fstrim/ks.yaml
   - ./intel-device-plugin/ks.yaml
   - ./kubelet-csr-approver/ks.yaml
   - ./metrics-server/ks.yaml

kubernetes/apps/kube-system/metrics-server/app/helmrelease.yaml

@@ -1,26 +1,34 @@
 ---
+# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/ocirepository_v1.json
+apiVersion: source.toolkit.fluxcd.io/v1
+kind: OCIRepository
+metadata:
+  name: metrics-server
+spec:
+  interval: 5m
+  layerSelector:
+    mediaType: application/vnd.cncf.helm.chart.content.v1.tar+gzip
+    operation: copy
+  ref:
+    tag: 3.12.2
+  url: oci://ghcr.io/home-operations/charts-mirror/metrics-server
+---
 # yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/helm.toolkit.fluxcd.io/helmrelease_v2.json
 apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: metrics-server
 spec:
-  interval: 30m
+  interval: 1h
-  chart:
+  chartRef:
-    spec:
+    kind: OCIRepository
-      chart: metrics-server
+    name: metrics-server
-      version: 3.12.2
-      sourceRef:
-        kind: HelmRepository
-        name: metrics-server
-        namespace: flux-system
   install:
     remediation:
-      retries: 3
+      retries: -1
   upgrade:
     cleanupOnFail: true
     remediation:
-      strategy: rollback
       retries: 3
   values:
     args:

kubernetes/apps/kube-system/metrics-server/ks.yaml

@@ -11,9 +11,6 @@ spec:
       app.kubernetes.io/name: *app
   interval: 1h
   path: ./kubernetes/apps/kube-system/metrics-server/app
-  postBuild:
-    substitute:
-      APP: *app
   prune: true
   retryInterval: 2m
   sourceRef:

kubernetes/apps/kube-system/node-feature-discovery/app/helmrelease.yaml

@@ -1,4 +1,19 @@
 ---
+# yaml-language-server: $schema=https://schemas.budimanjojo.com/source.toolkit.fluxcd.io/ocirepository_v1beta2.json
+apiVersion: source.toolkit.fluxcd.io/v1
+kind: OCIRepository
+metadata:
+  name: node-feature-discovery
+spec:
+  interval: 30m
+  timeout: 60s
+  url: oci://ghcr.io/home-operations/charts-mirror/node-feature-discovery
+  ref:
+    tag: 0.17.3
+  layerSelector:
+    mediaType: application/vnd.cncf.helm.chart.content.v1.tar+gzip
+    operation: copy
+---
 # yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/helm.toolkit.fluxcd.io/helmrelease_v2.json
 apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
@@ -6,28 +21,18 @@ metadata:
   name: node-feature-discovery
   namespace: kube-system
 spec:
-  interval: 30m
+  interval: 1h
-  chart:
+  timeout: 5m
-    spec:
+  chartRef:
-      chart: node-feature-discovery
+    kind: OCIRepository
-      version: 0.17.3
+    name: node-feature-discovery
-      sourceRef:
-        kind: HelmRepository
-        name: node-feature-discovery
-        namespace: flux-system
-  maxHistory: 2
   install:
-    createNamespace: true
-    crds: CreateReplace
     remediation:
-      retries: 3
+      retries: -1
   upgrade:
     cleanupOnFail: true
-    crds: CreateReplace
     remediation:
-      retries: 3
+      retries: 5
-  uninstall:
-    keepHistory: false
   values:
     worker:
       annotations:

kubernetes/apps/kube-system/reloader/app/helmrelease.yaml

@@ -1,35 +1,39 @@
 ---
+# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/ocirepository_v1.json
+apiVersion: source.toolkit.fluxcd.io/v1
+kind: OCIRepository
+metadata:
+  name: reloader
+spec:
+  interval: 5m
+  layerSelector:
+    mediaType: application/vnd.cncf.helm.chart.content.v1.tar+gzip
+    operation: copy
+  ref:
+    tag: 2.1.4
+  url: oci://ghcr.io/stakater/charts/reloader
+---
 # yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/helm.toolkit.fluxcd.io/helmrelease_v2.json
 apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: &name reloader
-  namespace: &namespace kube-system
 spec:
-  interval: 30m
+  interval: 1h
-  chart:
+  chartRef:
-    spec:
+    kind: OCIRepository
-      chart: *name
+    name: reloader
-      version: 2.1.3
-      sourceRef:
-        kind: HelmRepository
-        name: stakater
-        namespace: flux-system
-  maxHistory: 2
   install:
-    createNamespace: true
     remediation:
-      retries: 3
+      retries: -1
   upgrade:
     cleanupOnFail: true
     remediation:
       retries: 3
-  uninstall:
-    keepHistory: false
   values:
     fullnameOverride: *name
     reloader:
       reloadStrategy: annotations
       podMonitor:
         enabled: true
-        namespace: *namespace
+        namespace: "{{ .Release.Namespace }}"

kubernetes/apps/kube-system/reloader/ks.yaml

@@ -11,10 +11,7 @@ spec:
       app.kubernetes.io/name: *app
   interval: 1h
   path: ./kubernetes/apps/kube-system/reloader/app
-  postBuild:
+  prune: true
-    substitute:
-      APP: *app
-  prune: false
   retryInterval: 2m
   sourceRef:
     kind: GitRepository

kubernetes/apps/kube-system/snapshot-controller/app/helmrelease.yaml

@@ -1,4 +1,18 @@
 ---
+# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/ocirepository_v1.json
+apiVersion: source.toolkit.fluxcd.io/v1
+kind: OCIRepository
+metadata:
+  name: snapshot-controller
+spec:
+  interval: 5m
+  layerSelector:
+    mediaType: application/vnd.cncf.helm.chart.content.v1.tar+gzip
+    operation: copy
+  ref:
+    tag: 4.0.2
+  url: oci://ghcr.io/piraeusdatastore/helm-charts/snapshot-controller
+---
 # yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/helm.toolkit.fluxcd.io/helmrelease_v2.json
 apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
@@ -6,28 +20,19 @@ metadata:
   name: snapshot-controller
   namespace: kube-system
 spec:
-  interval: 30m
+  interval: 1h
-  chart:
+  chartRef:
-    spec:
+    kind: OCIRepository
-      chart: snapshot-controller
+    name: snapshot-controller
-      version: 4.0.2
-      sourceRef:
-        kind: HelmRepository
-        name: piraeus
-        namespace: flux-system
-  maxHistory: 2
   install:
     crds: CreateReplace
     remediation:
-      retries: 3
+      retries: -1
   upgrade:
     cleanupOnFail: true
     crds: CreateReplace
     remediation:
-      strategy: rollback
       retries: 3
-  uninstall:
-    keepHistory: false
   dependsOn:
     - name: rook-ceph-operator
       namespace: rook-ceph

kubernetes/apps/kube-system/snapshot-controller/ks.yaml

@@ -11,10 +11,12 @@ spec:
       app.kubernetes.io/name: *app
   interval: 1h
   path: ./kubernetes/apps/kube-system/snapshot-controller/app
-  postBuild:
+  healthChecks:
-    substitute:
+    - apiVersion: helm.toolkit.fluxcd.io/v2
-      APP: *app
+      kind: HelmRelease
-  prune: false
+      name: snapshot-controller
+      namespace: *namespace
+  prune: true
   retryInterval: 2m
   sourceRef:
     kind: GitRepository
@@ -22,4 +24,3 @@ spec:
     namespace: flux-system
   targetNamespace: *namespace
   timeout: 5m
-  wait: false

kubernetes/apps/kube-system/spegel/app/helmrelease.yaml

@@ -1,27 +1,35 @@
 ---
+# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/ocirepository_v1.json
+apiVersion: source.toolkit.fluxcd.io/v1
+kind: OCIRepository
+metadata:
+  name: spegel
+spec:
+  interval: 5m
+  layerSelector:
+    mediaType: application/vnd.cncf.helm.chart.content.v1.tar+gzip
+    operation: copy
+  ref:
+    tag: 0.3.0
+  url: oci://ghcr.io/spegel-org/helm-charts/spegel
+---
 # yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/helm.toolkit.fluxcd.io/helmrelease_v2.json
 apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: spegel
 spec:
-  interval: 30m
+  interval: 1h
-  chart:
+  chartRef:
-    spec:
+    kind: OCIRepository
-      chart: spegel
+    name: spegel
-      version: 0.3.0
-      sourceRef:
-        kind: HelmRepository
-        name: spegel
-        namespace: flux-system
   install:
     remediation:
-      retries: 3
+      retries: -1
   upgrade:
     cleanupOnFail: true
     remediation:
-      strategy: rollback
       retries: 3
   valuesFrom:
     - kind: ConfigMap
-      name: spegel-helm-values
+      name: spegel-values

kubernetes/apps/kube-system/spegel/app/kustomization.yaml

@@ -5,8 +5,8 @@ kind: Kustomization
 resources:
   - ./helmrelease.yaml
 configMapGenerator:
-  - name: spegel-helm-values
+  - name: spegel-values
     files:
-      - values.yaml=./helm-values.yaml
+      - values.yaml=./helm/values.yaml
 configurations:
-  - kustomizeconfig.yaml
+  - ./helm/kustomizeconfig.yaml

kubernetes/apps/kube-system/spegel/ks.yaml

@@ -11,9 +11,6 @@ spec:
       app.kubernetes.io/name: *app
   interval: 1h
   path: ./kubernetes/apps/kube-system/spegel/app
-  postBuild:
-    substitute:
-      APP: *app
   prune: false
   retryInterval: 2m
   sourceRef: