From 81d5a278fc7294d04d664cb9c0f0ffe8cbc26f77 Mon Sep 17 00:00:00 2001 From: heavybullets8 Date: Mon, 3 Mar 2025 13:58:54 -0700 Subject: [PATCH] feat(Repos): Change some to OCI --- .github/workflows/pre-pull-images.yaml | 2 +- .../cloudnative-pg/app/helmrelease.yaml | 12 ++++-------- .../cloudnative-pg/app/helmrepository.yaml | 17 +++++++++++++++++ .../cloudnative-pg/app/kustomization.yaml | 1 + .../database/dragonfly/app/helmrelease.yaml | 12 ++++-------- .../apps/default/authelia/app/helmrelease.yaml | 12 ++++-------- .../apps/default/glauth/app/helmrelease.yaml | 12 ++++-------- .../apps/default/homepage/app/helmrelease.yaml | 12 ++++-------- .../apps/default/immich/app/helmrelease.yaml | 12 ++++-------- .../default/stirling-pdf/app/helmrelease.yaml | 12 ++++-------- .../default/theme-park/app/helmrelease.yaml | 12 ++++-------- .../default/vaultwarden/app/helmrelease.yaml | 12 ++++-------- .../external-secrets/app/helmrelease.yaml | 12 ++++-------- .../external-secrets/app/helmrepository.yaml | 17 +++++++++++++++++ .../external-secrets/app/kustomization.yaml | 1 + .../onepassword/app/helmrelease.yaml | 12 ++++-------- .../flux-system/capacitor/app/helmrelease.yaml | 12 ++++-------- .../flux-instance/app/helmrelease.yaml | 12 ++++-------- .../flux-instance/app/helmrepository.yaml | 17 +++++++++++++++++ .../flux-instance/app/kustomization.yaml | 1 + .../flux-operator/app/helmrelease.yaml | 12 ++++-------- .../flux-operator/app/helmrepository.yaml | 17 +++++++++++++++++ .../flux-operator/app/kustomization.yaml | 1 + .../game/valheim/filebrowser/helmrelease.yaml | 12 ++++-------- .../kube-system/coredns/app/helmrelease.yaml | 13 +++++-------- .../kube-system/coredns/app/helmrepository.yaml | 17 +++++++++++++++++ .../kube-system/coredns/app/kustomization.yaml | 1 + .../generic-device-plugin/app/helmrelease.yaml | 14 +++++--------- .../kube-system/reloader/app/helmrelease.yaml | 12 ++++-------- .../reloader/app/helmrepository.yaml | 15 +++++++++++++++ .../kube-system/reloader/app/kustomization.yaml | 1 + .../kube-system/spegel/app/helmrelease.yaml | 12 ++++-------- .../kube-system/spegel/app/helmrepository.yaml | 17 +++++++++++++++++ .../kube-system/spegel/app/kustomization.yaml | 1 + .../apps/media/autobrr/app/helmrelease.yaml | 12 ++++-------- .../apps/media/cross-seed/app/helmrelease.yaml | 12 ++++-------- .../apps/media/deemix/app/helmrelease.yaml | 12 ++++-------- .../media/flaresolverr/app/helmrelease.yaml | 12 ++++-------- .../apps/media/jellyseerr/app/helmrelease.yaml | 12 ++++-------- .../apps/media/komga/app/helmrelease.yaml | 12 ++++-------- .../media/media-roller/app/helmrelease.yaml | 12 ++++-------- .../apps/media/notifiarr/app/helmrelease.yaml | 12 ++++-------- .../apps/media/plex/daps/helmrelease.yaml | 12 ++++-------- .../apps/media/plex/kometa/helmrelease.yaml | 12 ++++-------- .../apps/media/plex/plex/helmrelease.yaml | 12 ++++-------- .../apps/media/plex/tautulli/helmrelease.yaml | 12 ++++-------- .../apps/media/podgrab/app/helmrelease.yaml | 12 ++++-------- .../apps/media/prowlarr/app/helmrelease.yaml | 12 ++++-------- .../qbittorrent/qbitmanage/helmrelease.yaml | 14 +++++--------- .../qbittorrent/qbittorrent/helmrelease.yaml | 12 ++++-------- .../apps/media/radarr/app/helmrelease.yaml | 12 ++++-------- .../apps/media/recyclarr/app/helmrelease.yaml | 12 ++++-------- .../apps/media/requestrr/app/helmrelease.yaml | 12 ++++-------- .../apps/media/sabnzbd/app/helmrelease.yaml | 12 ++++-------- .../apps/media/sonarr/app/helmrelease.yaml | 12 ++++-------- .../apps/media/unpackerr/app/helmrelease.yaml | 12 ++++-------- .../network/cloudflared/app/helmrelease.yaml | 12 ++++-------- .../network/echo-server/app/helmrelease.yaml | 12 ++++-------- .../observability/gatus/app/helmrelease.yaml | 12 ++++-------- .../observability/grafana/app/helmrelease.yaml | 12 ++++-------- .../grafana/app/helmrepository.yaml | 15 +++++++++++++++ .../grafana/app/kustomization.yaml | 1 + .../kube-prometheus-stack/app/helmrelease.yaml | 12 ++++-------- .../app/helmrepository.yaml | 15 +++++++++++++++ .../app/kustomization.yaml | 1 + .../smartctl-exporter/app/helmrelease.yaml | 12 ++++-------- .../smartctl-exporter/app/helmrepository.yaml | 15 +++++++++++++++ .../smartctl-exporter/app/kustomization.yaml | 3 ++- .../apps/zfs/zfs-scrubber/app/helmrelease.yaml | 12 ++++-------- .../flux/meta/repositories/helm/bjw-s.yaml | 10 ---------- .../meta/repositories/helm/cloudnative-pg.yaml | 10 ---------- .../meta/repositories/helm/controlplaneio.yaml | 11 ----------- .../flux/meta/repositories/helm/coredns.yaml | 10 ---------- .../repositories/helm/external-secrets.yaml | 10 ---------- .../meta/repositories/helm/kustomization.yaml | 7 ------- .../repositories/helm/prometheus-community.yaml | 10 ---------- .../flux/meta/repositories/helm/spegel.yaml | 10 ---------- .../meta/repositories/oci/app-template.yaml | 17 +++++++++++++++++ .../meta/repositories/oci/kustomization.yaml | 3 ++- 79 files changed, 388 insertions(+), 467 deletions(-) create mode 100644 kubernetes/apps/database/cloudnative-pg/app/helmrepository.yaml create mode 100644 kubernetes/apps/external-secrets/external-secrets/app/helmrepository.yaml create mode 100644 kubernetes/apps/flux-system/flux-instance/app/helmrepository.yaml create mode 100644 kubernetes/apps/flux-system/flux-operator/app/helmrepository.yaml create mode 100644 kubernetes/apps/kube-system/coredns/app/helmrepository.yaml create mode 100644 kubernetes/apps/kube-system/reloader/app/helmrepository.yaml create mode 100644 kubernetes/apps/kube-system/spegel/app/helmrepository.yaml create mode 100644 kubernetes/apps/observability/grafana/app/helmrepository.yaml create mode 100644 kubernetes/apps/observability/kube-prometheus-stack/app/helmrepository.yaml create mode 100644 kubernetes/apps/observability/smartctl-exporter/app/helmrepository.yaml delete mode 100644 kubernetes/flux/meta/repositories/helm/bjw-s.yaml delete mode 100644 kubernetes/flux/meta/repositories/helm/cloudnative-pg.yaml delete mode 100644 kubernetes/flux/meta/repositories/helm/controlplaneio.yaml delete mode 100644 kubernetes/flux/meta/repositories/helm/coredns.yaml delete mode 100644 kubernetes/flux/meta/repositories/helm/external-secrets.yaml delete mode 100644 kubernetes/flux/meta/repositories/helm/prometheus-community.yaml delete mode 100644 kubernetes/flux/meta/repositories/helm/spegel.yaml create mode 100644 kubernetes/flux/meta/repositories/oci/app-template.yaml diff --git a/.github/workflows/pre-pull-images.yaml b/.github/workflows/pre-pull-images.yaml index b8d92a6f0..86b180cd3 100644 --- a/.github/workflows/pre-pull-images.yaml +++ b/.github/workflows/pre-pull-images.yaml @@ -45,7 +45,7 @@ jobs: ref: "${{ matrix.branches == 'default' && github.event.repository.default_branch || '' }}" - name: Gather Images - uses: docker://ghcr.io/allenporter/flux-local:v7.1.0 + uses: docker://ghcr.io/allenporter/flux-local:main@sha256:8606710916a44918f6ba1a0aa761cf1aae5947283868493ad0afcfaea72e08fe with: args: >- get cluster diff --git a/kubernetes/apps/database/cloudnative-pg/app/helmrelease.yaml b/kubernetes/apps/database/cloudnative-pg/app/helmrelease.yaml index 269bb5702..e29d7e513 100644 --- a/kubernetes/apps/database/cloudnative-pg/app/helmrelease.yaml +++ b/kubernetes/apps/database/cloudnative-pg/app/helmrelease.yaml @@ -6,14 +6,10 @@ metadata: name: cloudnative-pg spec: interval: 30m - chart: - spec: - chart: cloudnative-pg - version: 0.23.0 - sourceRef: - kind: HelmRepository - name: cloudnative-pg - namespace: flux-system + chartRef: + kind: OCIRepository + name: cloudnative-pg + namespace: database install: remediation: retries: 3 diff --git a/kubernetes/apps/database/cloudnative-pg/app/helmrepository.yaml b/kubernetes/apps/database/cloudnative-pg/app/helmrepository.yaml new file mode 100644 index 000000000..f4394e1f8 --- /dev/null +++ b/kubernetes/apps/database/cloudnative-pg/app/helmrepository.yaml @@ -0,0 +1,17 @@ +--- +# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/ocirepository_v1beta2.json +apiVersion: source.toolkit.fluxcd.io/v1beta2 +kind: OCIRepository +metadata: + name: cloudnative-pg + namespace: database +spec: + interval: 1h + layerSelector: + mediaType: application/vnd.cncf.helm.chart.content.v1.tar+gzip + operation: copy + ref: + tag: 0.23.0 + url: oci://ghcr.io/cloudnative-pg/charts/cloudnative-pg + verify: + provider: cosign diff --git a/kubernetes/apps/database/cloudnative-pg/app/kustomization.yaml b/kubernetes/apps/database/cloudnative-pg/app/kustomization.yaml index 4eed917b9..00f6f9e94 100644 --- a/kubernetes/apps/database/cloudnative-pg/app/kustomization.yaml +++ b/kubernetes/apps/database/cloudnative-pg/app/kustomization.yaml @@ -3,5 +3,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: + - ./helmrepository.yaml - ./externalsecret.yaml - ./helmrelease.yaml diff --git a/kubernetes/apps/database/dragonfly/app/helmrelease.yaml b/kubernetes/apps/database/dragonfly/app/helmrelease.yaml index 03113abff..16830b979 100644 --- a/kubernetes/apps/database/dragonfly/app/helmrelease.yaml +++ b/kubernetes/apps/database/dragonfly/app/helmrelease.yaml @@ -6,14 +6,10 @@ metadata: name: &app dragonfly-operator spec: interval: 30m - chart: - spec: - chart: app-template - version: 3.7.1 - sourceRef: - kind: HelmRepository - name: bjw-s - namespace: flux-system + chartRef: + kind: OCIRepository + name: app-template + namespace: flux-system install: remediation: retries: 3 diff --git a/kubernetes/apps/default/authelia/app/helmrelease.yaml b/kubernetes/apps/default/authelia/app/helmrelease.yaml index 48375b86b..15514ae4a 100644 --- a/kubernetes/apps/default/authelia/app/helmrelease.yaml +++ b/kubernetes/apps/default/authelia/app/helmrelease.yaml @@ -6,14 +6,10 @@ metadata: name: &app authelia spec: interval: 30m - chart: - spec: - chart: app-template - version: 3.7.1 - sourceRef: - kind: HelmRepository - name: bjw-s - namespace: flux-system + chartRef: + kind: OCIRepository + name: app-template + namespace: flux-system install: remediation: retries: 3 diff --git a/kubernetes/apps/default/glauth/app/helmrelease.yaml b/kubernetes/apps/default/glauth/app/helmrelease.yaml index b2e309633..4575bdd23 100644 --- a/kubernetes/apps/default/glauth/app/helmrelease.yaml +++ b/kubernetes/apps/default/glauth/app/helmrelease.yaml @@ -6,14 +6,10 @@ metadata: name: &app glauth spec: interval: 30m - chart: - spec: - chart: app-template - version: 3.7.1 - sourceRef: - kind: HelmRepository - name: bjw-s - namespace: flux-system + chartRef: + kind: OCIRepository + name: app-template + namespace: flux-system install: remediation: retries: 3 diff --git a/kubernetes/apps/default/homepage/app/helmrelease.yaml b/kubernetes/apps/default/homepage/app/helmrelease.yaml index eae951e18..3bb4be58c 100644 --- a/kubernetes/apps/default/homepage/app/helmrelease.yaml +++ b/kubernetes/apps/default/homepage/app/helmrelease.yaml @@ -6,14 +6,10 @@ metadata: name: &app homepage spec: interval: 30m - chart: - spec: - chart: app-template - version: 3.7.1 - sourceRef: - kind: HelmRepository - name: bjw-s - namespace: flux-system + chartRef: + kind: OCIRepository + name: app-template + namespace: flux-system maxHistory: 2 install: createNamespace: true diff --git a/kubernetes/apps/default/immich/app/helmrelease.yaml b/kubernetes/apps/default/immich/app/helmrelease.yaml index 78a1d34ba..d62a0028c 100644 --- a/kubernetes/apps/default/immich/app/helmrelease.yaml +++ b/kubernetes/apps/default/immich/app/helmrelease.yaml @@ -5,14 +5,10 @@ metadata: name: &app immich spec: interval: 30m - chart: - spec: - chart: app-template - version: 3.7.1 - sourceRef: - kind: HelmRepository - name: bjw-s - namespace: flux-system + chartRef: + kind: OCIRepository + name: app-template + namespace: flux-system install: remediation: retries: 3 diff --git a/kubernetes/apps/default/stirling-pdf/app/helmrelease.yaml b/kubernetes/apps/default/stirling-pdf/app/helmrelease.yaml index 24c5dfb9c..462e2d91f 100644 --- a/kubernetes/apps/default/stirling-pdf/app/helmrelease.yaml +++ b/kubernetes/apps/default/stirling-pdf/app/helmrelease.yaml @@ -6,14 +6,10 @@ metadata: name: &app stirling-pdf spec: interval: 30m - chart: - spec: - chart: app-template - version: 3.7.1 - sourceRef: - kind: HelmRepository - name: bjw-s - namespace: flux-system + chartRef: + kind: OCIRepository + name: app-template + namespace: flux-system install: remediation: retries: 3 diff --git a/kubernetes/apps/default/theme-park/app/helmrelease.yaml b/kubernetes/apps/default/theme-park/app/helmrelease.yaml index d471fc5ad..a266ec029 100644 --- a/kubernetes/apps/default/theme-park/app/helmrelease.yaml +++ b/kubernetes/apps/default/theme-park/app/helmrelease.yaml @@ -6,14 +6,10 @@ metadata: name: &app theme-park spec: interval: 30m - chart: - spec: - chart: app-template - version: 3.7.1 - sourceRef: - kind: HelmRepository - name: bjw-s - namespace: flux-system + chartRef: + kind: OCIRepository + name: app-template + namespace: flux-system install: remediation: retries: 3 diff --git a/kubernetes/apps/default/vaultwarden/app/helmrelease.yaml b/kubernetes/apps/default/vaultwarden/app/helmrelease.yaml index 8324a8aef..554b98058 100644 --- a/kubernetes/apps/default/vaultwarden/app/helmrelease.yaml +++ b/kubernetes/apps/default/vaultwarden/app/helmrelease.yaml @@ -6,14 +6,10 @@ metadata: name: &app vaultwarden spec: interval: 30m - chart: - spec: - chart: app-template - version: 3.7.1 - sourceRef: - kind: HelmRepository - name: bjw-s - namespace: flux-system + chartRef: + kind: OCIRepository + name: app-template + namespace: flux-system maxHistory: 2 install: createNamespace: true diff --git a/kubernetes/apps/external-secrets/external-secrets/app/helmrelease.yaml b/kubernetes/apps/external-secrets/external-secrets/app/helmrelease.yaml index 483872a40..a263c6d6a 100644 --- a/kubernetes/apps/external-secrets/external-secrets/app/helmrelease.yaml +++ b/kubernetes/apps/external-secrets/external-secrets/app/helmrelease.yaml @@ -6,14 +6,10 @@ metadata: name: external-secrets spec: interval: 30m - chart: - spec: - chart: external-secrets - version: 0.14.3 - sourceRef: - kind: HelmRepository - name: external-secrets - namespace: flux-system + chartRef: + kind: OCIRepository + name: external-secrets + namespace: external-secrets install: remediation: retries: 3 diff --git a/kubernetes/apps/external-secrets/external-secrets/app/helmrepository.yaml b/kubernetes/apps/external-secrets/external-secrets/app/helmrepository.yaml new file mode 100644 index 000000000..f47ca3281 --- /dev/null +++ b/kubernetes/apps/external-secrets/external-secrets/app/helmrepository.yaml @@ -0,0 +1,17 @@ +--- +# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/ocirepository_v1beta2.json +apiVersion: source.toolkit.fluxcd.io/v1beta2 +kind: OCIRepository +metadata: + name: external-secrets + namespace: external-secrets +spec: + interval: 1h + layerSelector: + mediaType: application/vnd.cncf.helm.chart.content.v1.tar+gzip + operation: copy + ref: + tag: 0.14.3 + url: oci://ghcr.io/external-secrets/charts/external-secrets + verify: + provider: cosign diff --git a/kubernetes/apps/external-secrets/external-secrets/app/kustomization.yaml b/kubernetes/apps/external-secrets/external-secrets/app/kustomization.yaml index 364206360..48540527c 100644 --- a/kubernetes/apps/external-secrets/external-secrets/app/kustomization.yaml +++ b/kubernetes/apps/external-secrets/external-secrets/app/kustomization.yaml @@ -3,6 +3,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: + - ./helmrepository.yaml - ./helmrelease.yaml configMapGenerator: - name: external-secrets-helm-values diff --git a/kubernetes/apps/external-secrets/onepassword/app/helmrelease.yaml b/kubernetes/apps/external-secrets/onepassword/app/helmrelease.yaml index d7a2f2a13..431f3be7e 100644 --- a/kubernetes/apps/external-secrets/onepassword/app/helmrelease.yaml +++ b/kubernetes/apps/external-secrets/onepassword/app/helmrelease.yaml @@ -6,14 +6,10 @@ metadata: name: onepassword spec: interval: 30m - chart: - spec: - chart: app-template - version: 3.7.1 - sourceRef: - kind: HelmRepository - name: bjw-s - namespace: flux-system + chartRef: + kind: OCIRepository + name: app-template + namespace: flux-system install: remediation: retries: 3 diff --git a/kubernetes/apps/flux-system/capacitor/app/helmrelease.yaml b/kubernetes/apps/flux-system/capacitor/app/helmrelease.yaml index b6137206e..e8c1fb057 100644 --- a/kubernetes/apps/flux-system/capacitor/app/helmrelease.yaml +++ b/kubernetes/apps/flux-system/capacitor/app/helmrelease.yaml @@ -6,14 +6,10 @@ metadata: name: &app capacitor spec: interval: 30m - chart: - spec: - chart: app-template - version: 3.7.1 - sourceRef: - kind: HelmRepository - name: bjw-s - namespace: flux-system + chartRef: + kind: OCIRepository + name: app-template + namespace: flux-system install: remediation: retries: 3 diff --git a/kubernetes/apps/flux-system/flux-instance/app/helmrelease.yaml b/kubernetes/apps/flux-system/flux-instance/app/helmrelease.yaml index ba6b8e34e..66c61838b 100644 --- a/kubernetes/apps/flux-system/flux-instance/app/helmrelease.yaml +++ b/kubernetes/apps/flux-system/flux-instance/app/helmrelease.yaml @@ -6,14 +6,10 @@ metadata: name: flux-instance spec: interval: 30m - chart: - spec: - chart: flux-instance - version: 0.17.0 - sourceRef: - kind: HelmRepository - name: controlplaneio - namespace: flux-system + chartRef: + kind: OCIRepository + name: flux-instance + namespace: flux-system install: remediation: retries: 3 diff --git a/kubernetes/apps/flux-system/flux-instance/app/helmrepository.yaml b/kubernetes/apps/flux-system/flux-instance/app/helmrepository.yaml new file mode 100644 index 000000000..f71b28e8d --- /dev/null +++ b/kubernetes/apps/flux-system/flux-instance/app/helmrepository.yaml @@ -0,0 +1,17 @@ +--- +# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/ocirepository_v1beta2.json +apiVersion: source.toolkit.fluxcd.io/v1beta2 +kind: OCIRepository +metadata: + name: flux-instance + namespace: flux-system +spec: + interval: 1h + layerSelector: + mediaType: application/vnd.cncf.helm.chart.content.v1.tar+gzip + operation: copy + ref: + tag: 0.17.0 + url: oci://ghcr.io/controlplaneio-fluxcd/charts/flux-instance + verify: + provider: cosign diff --git a/kubernetes/apps/flux-system/flux-instance/app/kustomization.yaml b/kubernetes/apps/flux-system/flux-instance/app/kustomization.yaml index fa1316e21..894cabaf5 100644 --- a/kubernetes/apps/flux-system/flux-instance/app/kustomization.yaml +++ b/kubernetes/apps/flux-system/flux-instance/app/kustomization.yaml @@ -3,6 +3,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: + - ./helmrepository.yaml - ./helmrelease.yaml - ./prometheusrule.yaml - ./webhook diff --git a/kubernetes/apps/flux-system/flux-operator/app/helmrelease.yaml b/kubernetes/apps/flux-system/flux-operator/app/helmrelease.yaml index 1f736f9b0..035852b8a 100644 --- a/kubernetes/apps/flux-system/flux-operator/app/helmrelease.yaml +++ b/kubernetes/apps/flux-system/flux-operator/app/helmrelease.yaml @@ -6,14 +6,10 @@ metadata: name: flux-operator spec: interval: 30m - chart: - spec: - chart: flux-operator - version: 0.17.0 - sourceRef: - kind: HelmRepository - name: controlplaneio - namespace: flux-system + chartRef: + kind: OCIRepository + name: flux-operator + namespace: flux-system install: remediation: retries: 3 diff --git a/kubernetes/apps/flux-system/flux-operator/app/helmrepository.yaml b/kubernetes/apps/flux-system/flux-operator/app/helmrepository.yaml new file mode 100644 index 000000000..f2c4425cc --- /dev/null +++ b/kubernetes/apps/flux-system/flux-operator/app/helmrepository.yaml @@ -0,0 +1,17 @@ +--- +# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/ocirepository_v1beta2.json +apiVersion: source.toolkit.fluxcd.io/v1beta2 +kind: OCIRepository +metadata: + name: flux-operator + namespace: flux-system +spec: + interval: 1h + layerSelector: + mediaType: application/vnd.cncf.helm.chart.content.v1.tar+gzip + operation: copy + ref: + tag: 0.17.0 + url: oci://ghcr.io/controlplaneio-fluxcd/charts/flux-operator + verify: + provider: cosign diff --git a/kubernetes/apps/flux-system/flux-operator/app/kustomization.yaml b/kubernetes/apps/flux-system/flux-operator/app/kustomization.yaml index 51ab20283..b7517f534 100644 --- a/kubernetes/apps/flux-system/flux-operator/app/kustomization.yaml +++ b/kubernetes/apps/flux-system/flux-operator/app/kustomization.yaml @@ -3,6 +3,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: + - ./helmrepository.yaml - ./helmrelease.yaml configMapGenerator: - name: flux-operator-helm-values diff --git a/kubernetes/apps/game/valheim/filebrowser/helmrelease.yaml b/kubernetes/apps/game/valheim/filebrowser/helmrelease.yaml index 937a4527f..b0473f038 100644 --- a/kubernetes/apps/game/valheim/filebrowser/helmrelease.yaml +++ b/kubernetes/apps/game/valheim/filebrowser/helmrelease.yaml @@ -6,14 +6,10 @@ metadata: name: &app vh-mods spec: interval: 30m - chart: - spec: - chart: app-template - version: 3.7.1 - sourceRef: - kind: HelmRepository - name: bjw-s - namespace: flux-system + chartRef: + kind: OCIRepository + name: app-template + namespace: flux-system install: remediation: retries: 3 diff --git a/kubernetes/apps/kube-system/coredns/app/helmrelease.yaml b/kubernetes/apps/kube-system/coredns/app/helmrelease.yaml index 9622d25b0..6aa1a4166 100644 --- a/kubernetes/apps/kube-system/coredns/app/helmrelease.yaml +++ b/kubernetes/apps/kube-system/coredns/app/helmrelease.yaml @@ -4,16 +4,13 @@ apiVersion: helm.toolkit.fluxcd.io/v2 kind: HelmRelease metadata: name: coredns + namespace: kube-system spec: interval: 30m - chart: - spec: - chart: coredns - version: 1.39.1 - sourceRef: - kind: HelmRepository - name: coredns - namespace: flux-system + chartRef: + kind: OCIRepository + name: coredns + namespace: kube-system install: remediation: retries: 3 diff --git a/kubernetes/apps/kube-system/coredns/app/helmrepository.yaml b/kubernetes/apps/kube-system/coredns/app/helmrepository.yaml new file mode 100644 index 000000000..ef0fafa17 --- /dev/null +++ b/kubernetes/apps/kube-system/coredns/app/helmrepository.yaml @@ -0,0 +1,17 @@ +--- +# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/ocirepository_v1beta2.json +apiVersion: source.toolkit.fluxcd.io/v1beta2 +kind: OCIRepository +metadata: + name: coredns + namespace: kube-system +spec: + interval: 1h + layerSelector: + mediaType: application/vnd.cncf.helm.chart.content.v1.tar+gzip + operation: copy + url: oci://ghcr.io/coredns/charts/coredns + ref: + tag: 1.39.1 + verify: + provider: cosign diff --git a/kubernetes/apps/kube-system/coredns/app/kustomization.yaml b/kubernetes/apps/kube-system/coredns/app/kustomization.yaml index 39444bbd4..53b1ba6fb 100644 --- a/kubernetes/apps/kube-system/coredns/app/kustomization.yaml +++ b/kubernetes/apps/kube-system/coredns/app/kustomization.yaml @@ -3,6 +3,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: + - ./helmrepository.yaml - ./helmrelease.yaml configMapGenerator: - name: coredns-helm-values diff --git a/kubernetes/apps/kube-system/generic-device-plugin/app/helmrelease.yaml b/kubernetes/apps/kube-system/generic-device-plugin/app/helmrelease.yaml index 0d10e6386..71ed696b9 100644 --- a/kubernetes/apps/kube-system/generic-device-plugin/app/helmrelease.yaml +++ b/kubernetes/apps/kube-system/generic-device-plugin/app/helmrelease.yaml @@ -6,14 +6,10 @@ metadata: name: generic-device-plugin spec: interval: 30m - chart: - spec: - chart: app-template - version: 3.7.1 - sourceRef: - kind: HelmRepository - name: bjw-s - namespace: flux-system + chartRef: + kind: OCIRepository + name: app-template + namespace: flux-system install: remediation: retries: 3 @@ -79,4 +75,4 @@ spec: type: hostPath hostPath: /var/lib/kubelet/device-plugins globalMounts: - - path: /var/lib/kubelet/device-plugins \ No newline at end of file + - path: /var/lib/kubelet/device-plugins diff --git a/kubernetes/apps/kube-system/reloader/app/helmrelease.yaml b/kubernetes/apps/kube-system/reloader/app/helmrelease.yaml index af70ea7bb..ec93167f4 100644 --- a/kubernetes/apps/kube-system/reloader/app/helmrelease.yaml +++ b/kubernetes/apps/kube-system/reloader/app/helmrelease.yaml @@ -6,14 +6,10 @@ metadata: name: reloader spec: interval: 30m - chart: - spec: - chart: reloader - version: 1.3.0 - sourceRef: - kind: HelmRepository - name: stakater - namespace: flux-system + chartRef: + kind: OCIRepository + name: reloader + namespace: kube-system install: remediation: retries: 3 diff --git a/kubernetes/apps/kube-system/reloader/app/helmrepository.yaml b/kubernetes/apps/kube-system/reloader/app/helmrepository.yaml new file mode 100644 index 000000000..80fcc3290 --- /dev/null +++ b/kubernetes/apps/kube-system/reloader/app/helmrepository.yaml @@ -0,0 +1,15 @@ +--- +# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/ocirepository_v1beta2.json +apiVersion: source.toolkit.fluxcd.io/v1beta2 +kind: OCIRepository +metadata: + name: reloader + namespace: kube-system +spec: + interval: 1h + layerSelector: + mediaType: application/vnd.cncf.helm.chart.content.v1.tar+gzip + operation: copy + ref: + tag: 1.3.0 + url: oci://ghcr.io/stakater/charts/reloader diff --git a/kubernetes/apps/kube-system/reloader/app/kustomization.yaml b/kubernetes/apps/kube-system/reloader/app/kustomization.yaml index 17cbc72b2..4ceb6e752 100644 --- a/kubernetes/apps/kube-system/reloader/app/kustomization.yaml +++ b/kubernetes/apps/kube-system/reloader/app/kustomization.yaml @@ -3,4 +3,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: + - ./helmrepository.yaml - ./helmrelease.yaml diff --git a/kubernetes/apps/kube-system/spegel/app/helmrelease.yaml b/kubernetes/apps/kube-system/spegel/app/helmrelease.yaml index 728a6cca0..e5d9878da 100644 --- a/kubernetes/apps/kube-system/spegel/app/helmrelease.yaml +++ b/kubernetes/apps/kube-system/spegel/app/helmrelease.yaml @@ -7,14 +7,10 @@ metadata: namespace: flux-system spec: interval: 30m - chart: - spec: - chart: spegel - version: v0.0.30 - sourceRef: - kind: HelmRepository - name: spegel - namespace: flux-system + chartRef: + kind: OCIRepository + name: spegel + namespace: kube-system install: remediation: retries: 3 diff --git a/kubernetes/apps/kube-system/spegel/app/helmrepository.yaml b/kubernetes/apps/kube-system/spegel/app/helmrepository.yaml new file mode 100644 index 000000000..4c63f37c2 --- /dev/null +++ b/kubernetes/apps/kube-system/spegel/app/helmrepository.yaml @@ -0,0 +1,17 @@ +--- +# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/ocirepository_v1beta2.json +apiVersion: source.toolkit.fluxcd.io/v1beta2 +kind: OCIRepository +metadata: + name: spegel + namespace: kube-system +spec: + interval: 1h + layerSelector: + mediaType: application/vnd.cncf.helm.chart.content.v1.tar+gzip + operation: copy + ref: + tag: v0.0.30 + url: oci://ghcr.io/spegel-org/helm-charts/spegel + verify: + provider: cosign diff --git a/kubernetes/apps/kube-system/spegel/app/kustomization.yaml b/kubernetes/apps/kube-system/spegel/app/kustomization.yaml index 8c7c0551d..b29e810f3 100644 --- a/kubernetes/apps/kube-system/spegel/app/kustomization.yaml +++ b/kubernetes/apps/kube-system/spegel/app/kustomization.yaml @@ -3,6 +3,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: + - ./helmrepository.yaml - ./helmrelease.yaml configMapGenerator: - name: spegel-helm-values diff --git a/kubernetes/apps/media/autobrr/app/helmrelease.yaml b/kubernetes/apps/media/autobrr/app/helmrelease.yaml index 20ca49bfa..b65b7e3d5 100644 --- a/kubernetes/apps/media/autobrr/app/helmrelease.yaml +++ b/kubernetes/apps/media/autobrr/app/helmrelease.yaml @@ -6,14 +6,10 @@ metadata: name: &app autobrr spec: interval: 30m - chart: - spec: - chart: app-template - version: 3.7.1 - sourceRef: - kind: HelmRepository - name: bjw-s - namespace: flux-system + chartRef: + kind: OCIRepository + name: app-template + namespace: flux-system install: remediation: retries: 3 diff --git a/kubernetes/apps/media/cross-seed/app/helmrelease.yaml b/kubernetes/apps/media/cross-seed/app/helmrelease.yaml index 25f087e0e..b0a68dc11 100644 --- a/kubernetes/apps/media/cross-seed/app/helmrelease.yaml +++ b/kubernetes/apps/media/cross-seed/app/helmrelease.yaml @@ -6,14 +6,10 @@ metadata: name: &app cross-seed spec: interval: 30m - chart: - spec: - chart: app-template - version: 3.7.1 - sourceRef: - kind: HelmRepository - name: bjw-s - namespace: flux-system + chartRef: + kind: OCIRepository + name: app-template + namespace: flux-system install: remediation: retries: 3 diff --git a/kubernetes/apps/media/deemix/app/helmrelease.yaml b/kubernetes/apps/media/deemix/app/helmrelease.yaml index b438ffcdd..5f124d6fc 100644 --- a/kubernetes/apps/media/deemix/app/helmrelease.yaml +++ b/kubernetes/apps/media/deemix/app/helmrelease.yaml @@ -6,14 +6,10 @@ metadata: name: &app deemix spec: interval: 30m - chart: - spec: - chart: app-template - version: 3.7.1 - sourceRef: - kind: HelmRepository - name: bjw-s - namespace: flux-system + chartRef: + kind: OCIRepository + name: app-template + namespace: flux-system maxHistory: 2 install: remediation: diff --git a/kubernetes/apps/media/flaresolverr/app/helmrelease.yaml b/kubernetes/apps/media/flaresolverr/app/helmrelease.yaml index 12a8e354e..97d495531 100644 --- a/kubernetes/apps/media/flaresolverr/app/helmrelease.yaml +++ b/kubernetes/apps/media/flaresolverr/app/helmrelease.yaml @@ -6,14 +6,10 @@ metadata: name: &app flaresolverr spec: interval: 30m - chart: - spec: - chart: app-template - version: 3.7.1 - sourceRef: - kind: HelmRepository - name: bjw-s - namespace: flux-system + chartRef: + kind: OCIRepository + name: app-template + namespace: flux-system maxHistory: 2 install: remediation: diff --git a/kubernetes/apps/media/jellyseerr/app/helmrelease.yaml b/kubernetes/apps/media/jellyseerr/app/helmrelease.yaml index afe2077c2..2645c2ff6 100644 --- a/kubernetes/apps/media/jellyseerr/app/helmrelease.yaml +++ b/kubernetes/apps/media/jellyseerr/app/helmrelease.yaml @@ -6,14 +6,10 @@ metadata: name: &app jellyseerr spec: interval: 30m - chart: - spec: - chart: app-template - version: 3.7.1 - sourceRef: - kind: HelmRepository - name: bjw-s - namespace: flux-system + chartRef: + kind: OCIRepository + name: app-template + namespace: flux-system install: remediation: retries: 3 diff --git a/kubernetes/apps/media/komga/app/helmrelease.yaml b/kubernetes/apps/media/komga/app/helmrelease.yaml index 9d7e7727b..11b058d50 100644 --- a/kubernetes/apps/media/komga/app/helmrelease.yaml +++ b/kubernetes/apps/media/komga/app/helmrelease.yaml @@ -6,14 +6,10 @@ metadata: name: &app komga spec: interval: 30m - chart: - spec: - chart: app-template - version: 3.7.1 - sourceRef: - kind: HelmRepository - name: bjw-s - namespace: flux-system + chartRef: + kind: OCIRepository + name: app-template + namespace: flux-system maxHistory: 2 install: createNamespace: true diff --git a/kubernetes/apps/media/media-roller/app/helmrelease.yaml b/kubernetes/apps/media/media-roller/app/helmrelease.yaml index 1a2483558..b4dbcc7c9 100644 --- a/kubernetes/apps/media/media-roller/app/helmrelease.yaml +++ b/kubernetes/apps/media/media-roller/app/helmrelease.yaml @@ -6,14 +6,10 @@ metadata: name: &app media-roller spec: interval: 30m - chart: - spec: - chart: app-template - version: 3.7.1 - sourceRef: - kind: HelmRepository - name: bjw-s - namespace: flux-system + chartRef: + kind: OCIRepository + name: app-template + namespace: flux-system install: remediation: retries: 3 diff --git a/kubernetes/apps/media/notifiarr/app/helmrelease.yaml b/kubernetes/apps/media/notifiarr/app/helmrelease.yaml index e297d9df2..c14767ff9 100644 --- a/kubernetes/apps/media/notifiarr/app/helmrelease.yaml +++ b/kubernetes/apps/media/notifiarr/app/helmrelease.yaml @@ -6,14 +6,10 @@ metadata: name: &app notifiarr spec: interval: 30m - chart: - spec: - chart: app-template - version: 3.7.1 - sourceRef: - kind: HelmRepository - name: bjw-s - namespace: flux-system + chartRef: + kind: OCIRepository + name: app-template + namespace: flux-system install: remediation: retries: 3 diff --git a/kubernetes/apps/media/plex/daps/helmrelease.yaml b/kubernetes/apps/media/plex/daps/helmrelease.yaml index e62a712cf..e45ce5c85 100644 --- a/kubernetes/apps/media/plex/daps/helmrelease.yaml +++ b/kubernetes/apps/media/plex/daps/helmrelease.yaml @@ -7,14 +7,10 @@ metadata: namespace: media spec: interval: 30m - chart: - spec: - chart: app-template - version: 3.7.1 - sourceRef: - kind: HelmRepository - name: bjw-s - namespace: flux-system + chartRef: + kind: OCIRepository + name: app-template + namespace: flux-system maxHistory: 2 install: remediation: diff --git a/kubernetes/apps/media/plex/kometa/helmrelease.yaml b/kubernetes/apps/media/plex/kometa/helmrelease.yaml index baea0dd74..19337ad68 100644 --- a/kubernetes/apps/media/plex/kometa/helmrelease.yaml +++ b/kubernetes/apps/media/plex/kometa/helmrelease.yaml @@ -6,14 +6,10 @@ metadata: name: &app kometa spec: interval: 30m - chart: - spec: - chart: app-template - version: 3.7.1 - sourceRef: - kind: HelmRepository - name: bjw-s - namespace: flux-system + chartRef: + kind: OCIRepository + name: app-template + namespace: flux-system install: remediation: retries: 3 diff --git a/kubernetes/apps/media/plex/plex/helmrelease.yaml b/kubernetes/apps/media/plex/plex/helmrelease.yaml index 239301907..6eaa7e3f2 100644 --- a/kubernetes/apps/media/plex/plex/helmrelease.yaml +++ b/kubernetes/apps/media/plex/plex/helmrelease.yaml @@ -6,14 +6,10 @@ metadata: name: &app plex spec: interval: 30m - chart: - spec: - chart: app-template - version: 3.7.1 - sourceRef: - kind: HelmRepository - name: bjw-s - namespace: flux-system + chartRef: + kind: OCIRepository + name: app-template + namespace: flux-system install: remediation: retries: 3 diff --git a/kubernetes/apps/media/plex/tautulli/helmrelease.yaml b/kubernetes/apps/media/plex/tautulli/helmrelease.yaml index 165773bdf..8f66da652 100644 --- a/kubernetes/apps/media/plex/tautulli/helmrelease.yaml +++ b/kubernetes/apps/media/plex/tautulli/helmrelease.yaml @@ -6,14 +6,10 @@ metadata: name: &app tautulli spec: interval: 30m - chart: - spec: - chart: app-template - version: 3.7.1 - sourceRef: - kind: HelmRepository - name: bjw-s - namespace: flux-system + chartRef: + kind: OCIRepository + name: app-template + namespace: flux-system install: remediation: retries: 3 diff --git a/kubernetes/apps/media/podgrab/app/helmrelease.yaml b/kubernetes/apps/media/podgrab/app/helmrelease.yaml index 34e9c9de5..5c07e3d8e 100644 --- a/kubernetes/apps/media/podgrab/app/helmrelease.yaml +++ b/kubernetes/apps/media/podgrab/app/helmrelease.yaml @@ -6,14 +6,10 @@ metadata: name: &app podgrab spec: interval: 30m - chart: - spec: - chart: app-template - version: 3.7.1 - sourceRef: - kind: HelmRepository - name: bjw-s - namespace: flux-system + chartRef: + kind: OCIRepository + name: app-template + namespace: flux-system install: remediation: retries: 3 diff --git a/kubernetes/apps/media/prowlarr/app/helmrelease.yaml b/kubernetes/apps/media/prowlarr/app/helmrelease.yaml index cb4a55a8a..b54498091 100644 --- a/kubernetes/apps/media/prowlarr/app/helmrelease.yaml +++ b/kubernetes/apps/media/prowlarr/app/helmrelease.yaml @@ -7,14 +7,10 @@ metadata: namespace: media spec: interval: 15m - chart: - spec: - chart: app-template - version: 3.7.1 - sourceRef: - kind: HelmRepository - name: bjw-s - namespace: flux-system + chartRef: + kind: OCIRepository + name: app-template + namespace: flux-system maxHistory: 3 install: remediation: diff --git a/kubernetes/apps/media/qbittorrent/qbitmanage/helmrelease.yaml b/kubernetes/apps/media/qbittorrent/qbitmanage/helmrelease.yaml index 4091b1922..c7ae0f3c9 100644 --- a/kubernetes/apps/media/qbittorrent/qbitmanage/helmrelease.yaml +++ b/kubernetes/apps/media/qbittorrent/qbitmanage/helmrelease.yaml @@ -6,14 +6,10 @@ metadata: name: qbitmanage spec: interval: 30m - chart: - spec: - chart: app-template - version: 3.7.1 - sourceRef: - kind: HelmRepository - name: bjw-s - namespace: flux-system + chartRef: + kind: OCIRepository + name: app-template + namespace: flux-system install: remediation: retries: 3 @@ -116,4 +112,4 @@ spec: server: ${TRUENAS_IP} path: /mnt/speed/snatch globalMounts: - - path: /speed/snatch \ No newline at end of file + - path: /speed/snatch diff --git a/kubernetes/apps/media/qbittorrent/qbittorrent/helmrelease.yaml b/kubernetes/apps/media/qbittorrent/qbittorrent/helmrelease.yaml index 96d93d8d7..434859000 100644 --- a/kubernetes/apps/media/qbittorrent/qbittorrent/helmrelease.yaml +++ b/kubernetes/apps/media/qbittorrent/qbittorrent/helmrelease.yaml @@ -6,14 +6,10 @@ metadata: name: &app qbittorrent spec: interval: 30m - chart: - spec: - chart: app-template - version: 3.7.1 - sourceRef: - kind: HelmRepository - name: bjw-s - namespace: flux-system + chartRef: + kind: OCIRepository + name: app-template + namespace: flux-system dependsOn: - name: generic-device-plugin namespace: kube-system diff --git a/kubernetes/apps/media/radarr/app/helmrelease.yaml b/kubernetes/apps/media/radarr/app/helmrelease.yaml index dea788e08..650b2200f 100644 --- a/kubernetes/apps/media/radarr/app/helmrelease.yaml +++ b/kubernetes/apps/media/radarr/app/helmrelease.yaml @@ -7,14 +7,10 @@ metadata: namespace: media spec: interval: 15m - chart: - spec: - chart: app-template - version: 3.7.1 - sourceRef: - kind: HelmRepository - name: bjw-s - namespace: flux-system + chartRef: + kind: OCIRepository + name: app-template + namespace: flux-system maxHistory: 3 install: remediation: diff --git a/kubernetes/apps/media/recyclarr/app/helmrelease.yaml b/kubernetes/apps/media/recyclarr/app/helmrelease.yaml index 578136df1..b7a7c462c 100644 --- a/kubernetes/apps/media/recyclarr/app/helmrelease.yaml +++ b/kubernetes/apps/media/recyclarr/app/helmrelease.yaml @@ -6,14 +6,10 @@ metadata: name: &app recyclarr spec: interval: 30m - chart: - spec: - chart: app-template - version: 3.7.1 - sourceRef: - kind: HelmRepository - name: bjw-s - namespace: flux-system + chartRef: + kind: OCIRepository + name: app-template + namespace: flux-system install: remediation: retries: 3 diff --git a/kubernetes/apps/media/requestrr/app/helmrelease.yaml b/kubernetes/apps/media/requestrr/app/helmrelease.yaml index 3832d326c..dbde6117b 100644 --- a/kubernetes/apps/media/requestrr/app/helmrelease.yaml +++ b/kubernetes/apps/media/requestrr/app/helmrelease.yaml @@ -7,14 +7,10 @@ metadata: namespace: media spec: interval: 15m - chart: - spec: - chart: app-template - version: 3.7.1 - sourceRef: - kind: HelmRepository - name: bjw-s - namespace: flux-system + chartRef: + kind: OCIRepository + name: app-template + namespace: flux-system maxHistory: 3 install: remediation: diff --git a/kubernetes/apps/media/sabnzbd/app/helmrelease.yaml b/kubernetes/apps/media/sabnzbd/app/helmrelease.yaml index bbce0d24a..59ca6af19 100644 --- a/kubernetes/apps/media/sabnzbd/app/helmrelease.yaml +++ b/kubernetes/apps/media/sabnzbd/app/helmrelease.yaml @@ -6,14 +6,10 @@ metadata: name: &app sabnzbd spec: interval: 30m - chart: - spec: - chart: app-template - version: 3.7.1 - sourceRef: - kind: HelmRepository - name: bjw-s - namespace: flux-system + chartRef: + kind: OCIRepository + name: app-template + namespace: flux-system install: remediation: retries: 3 diff --git a/kubernetes/apps/media/sonarr/app/helmrelease.yaml b/kubernetes/apps/media/sonarr/app/helmrelease.yaml index f73b2c1e5..4cb4f840f 100644 --- a/kubernetes/apps/media/sonarr/app/helmrelease.yaml +++ b/kubernetes/apps/media/sonarr/app/helmrelease.yaml @@ -7,14 +7,10 @@ metadata: namespace: media spec: interval: 15m - chart: - spec: - chart: app-template - version: 3.7.1 - sourceRef: - kind: HelmRepository - name: bjw-s - namespace: flux-system + chartRef: + kind: OCIRepository + name: app-template + namespace: flux-system maxHistory: 3 install: remediation: diff --git a/kubernetes/apps/media/unpackerr/app/helmrelease.yaml b/kubernetes/apps/media/unpackerr/app/helmrelease.yaml index f5360cdbc..eb603da2c 100644 --- a/kubernetes/apps/media/unpackerr/app/helmrelease.yaml +++ b/kubernetes/apps/media/unpackerr/app/helmrelease.yaml @@ -6,14 +6,10 @@ metadata: name: &app unpackerr spec: interval: 30m - chart: - spec: - chart: app-template - version: 3.7.1 - sourceRef: - kind: HelmRepository - name: bjw-s - namespace: flux-system + chartRef: + kind: OCIRepository + name: app-template + namespace: flux-system install: remediation: retries: 3 diff --git a/kubernetes/apps/network/cloudflared/app/helmrelease.yaml b/kubernetes/apps/network/cloudflared/app/helmrelease.yaml index a1f4bcb7e..92b55ab43 100644 --- a/kubernetes/apps/network/cloudflared/app/helmrelease.yaml +++ b/kubernetes/apps/network/cloudflared/app/helmrelease.yaml @@ -6,14 +6,10 @@ metadata: name: &app cloudflared spec: interval: 30m - chart: - spec: - chart: app-template - version: 3.7.1 - sourceRef: - kind: HelmRepository - name: bjw-s - namespace: flux-system + chartRef: + kind: OCIRepository + name: app-template + namespace: flux-system install: remediation: retries: 3 diff --git a/kubernetes/apps/network/echo-server/app/helmrelease.yaml b/kubernetes/apps/network/echo-server/app/helmrelease.yaml index e13527895..ea2b574eb 100644 --- a/kubernetes/apps/network/echo-server/app/helmrelease.yaml +++ b/kubernetes/apps/network/echo-server/app/helmrelease.yaml @@ -5,14 +5,10 @@ metadata: name: echo-server spec: interval: 30m - chart: - spec: - chart: app-template - version: 3.7.1 - sourceRef: - kind: HelmRepository - name: bjw-s - namespace: flux-system + chartRef: + kind: OCIRepository + name: app-template + namespace: flux-system install: remediation: retries: 3 diff --git a/kubernetes/apps/observability/gatus/app/helmrelease.yaml b/kubernetes/apps/observability/gatus/app/helmrelease.yaml index cb9869921..4e4447b8c 100644 --- a/kubernetes/apps/observability/gatus/app/helmrelease.yaml +++ b/kubernetes/apps/observability/gatus/app/helmrelease.yaml @@ -6,14 +6,10 @@ metadata: name: &app gatus spec: interval: 30m - chart: - spec: - chart: app-template - version: 3.7.1 - sourceRef: - kind: HelmRepository - name: bjw-s - namespace: flux-system + chartRef: + kind: OCIRepository + name: app-template + namespace: flux-system install: remediation: retries: 3 diff --git a/kubernetes/apps/observability/grafana/app/helmrelease.yaml b/kubernetes/apps/observability/grafana/app/helmrelease.yaml index 625785baa..4cf0ac707 100644 --- a/kubernetes/apps/observability/grafana/app/helmrelease.yaml +++ b/kubernetes/apps/observability/grafana/app/helmrelease.yaml @@ -6,14 +6,10 @@ metadata: name: grafana spec: interval: 30m - chart: - spec: - chart: grafana - version: 8.10.1 - sourceRef: - kind: HelmRepository - name: grafana - namespace: flux-system + chartRef: + kind: OCIRepository + name: grafana + namespace: observability install: remediation: retries: 3 diff --git a/kubernetes/apps/observability/grafana/app/helmrepository.yaml b/kubernetes/apps/observability/grafana/app/helmrepository.yaml new file mode 100644 index 000000000..b0255b0c0 --- /dev/null +++ b/kubernetes/apps/observability/grafana/app/helmrepository.yaml @@ -0,0 +1,15 @@ +--- +# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/ocirepository_v1beta2.json +apiVersion: source.toolkit.fluxcd.io/v1beta2 +kind: OCIRepository +metadata: + name: grafana + namespace: observability +spec: + interval: 1h + layerSelector: + mediaType: application/vnd.cncf.helm.chart.content.v1.tar+gzip + operation: copy + ref: + tag: 8.10.1 + url: oci://ghcr.io/grafana/helm-charts/grafana diff --git a/kubernetes/apps/observability/grafana/app/kustomization.yaml b/kubernetes/apps/observability/grafana/app/kustomization.yaml index 4eed917b9..00f6f9e94 100644 --- a/kubernetes/apps/observability/grafana/app/kustomization.yaml +++ b/kubernetes/apps/observability/grafana/app/kustomization.yaml @@ -3,5 +3,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: + - ./helmrepository.yaml - ./externalsecret.yaml - ./helmrelease.yaml diff --git a/kubernetes/apps/observability/kube-prometheus-stack/app/helmrelease.yaml b/kubernetes/apps/observability/kube-prometheus-stack/app/helmrelease.yaml index 8aa649d91..1a6648754 100644 --- a/kubernetes/apps/observability/kube-prometheus-stack/app/helmrelease.yaml +++ b/kubernetes/apps/observability/kube-prometheus-stack/app/helmrelease.yaml @@ -6,14 +6,10 @@ metadata: name: kube-prometheus-stack spec: interval: 30m - chart: - spec: - chart: kube-prometheus-stack - version: 69.7.2 - sourceRef: - kind: HelmRepository - name: prometheus-community - namespace: flux-system + chartRef: + kind: OCIRepository + name: kube-prometheus-stack + namespace: observability install: crds: Skip remediation: diff --git a/kubernetes/apps/observability/kube-prometheus-stack/app/helmrepository.yaml b/kubernetes/apps/observability/kube-prometheus-stack/app/helmrepository.yaml new file mode 100644 index 000000000..7a522ff4f --- /dev/null +++ b/kubernetes/apps/observability/kube-prometheus-stack/app/helmrepository.yaml @@ -0,0 +1,15 @@ +--- +# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/ocirepository_v1beta2.json +apiVersion: source.toolkit.fluxcd.io/v1beta2 +kind: OCIRepository +metadata: + name: kube-prometheus-stack + namespace: observability +spec: + interval: 1h + layerSelector: + mediaType: application/vnd.cncf.helm.chart.content.v1.tar+gzip + operation: copy + ref: + tag: 69.7.2 + url: oci://ghcr.io/prometheus-community/charts/kube-prometheus-stack diff --git a/kubernetes/apps/observability/kube-prometheus-stack/app/kustomization.yaml b/kubernetes/apps/observability/kube-prometheus-stack/app/kustomization.yaml index d132dc091..440b71d0d 100644 --- a/kubernetes/apps/observability/kube-prometheus-stack/app/kustomization.yaml +++ b/kubernetes/apps/observability/kube-prometheus-stack/app/kustomization.yaml @@ -3,6 +3,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: + - ./helmrepository.yaml - ./alertmanagerconfig.yaml - ./externalsecret.yaml - ./helmrelease.yaml diff --git a/kubernetes/apps/observability/smartctl-exporter/app/helmrelease.yaml b/kubernetes/apps/observability/smartctl-exporter/app/helmrelease.yaml index 853667f33..9928b23c7 100644 --- a/kubernetes/apps/observability/smartctl-exporter/app/helmrelease.yaml +++ b/kubernetes/apps/observability/smartctl-exporter/app/helmrelease.yaml @@ -6,14 +6,10 @@ metadata: name: &app smartctl-exporter spec: interval: 30m - chart: - spec: - chart: prometheus-smartctl-exporter - version: 0.13.0 - sourceRef: - kind: HelmRepository - name: prometheus-community - namespace: flux-system + chartRef: + kind: OCIRepository + name: smartctl-exporter + namespace: observability install: remediation: retries: 3 diff --git a/kubernetes/apps/observability/smartctl-exporter/app/helmrepository.yaml b/kubernetes/apps/observability/smartctl-exporter/app/helmrepository.yaml new file mode 100644 index 000000000..f372cc364 --- /dev/null +++ b/kubernetes/apps/observability/smartctl-exporter/app/helmrepository.yaml @@ -0,0 +1,15 @@ +--- +# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/ocirepository_v1beta2.json +apiVersion: source.toolkit.fluxcd.io/v1beta2 +kind: OCIRepository +metadata: + name: smartctl-exporter + namespace: observability +spec: + interval: 1h + layerSelector: + mediaType: application/vnd.cncf.helm.chart.content.v1.tar+gzip + operation: copy + ref: + tag: 0.13.0 + url: oci://ghcr.io/prometheus-community/charts/prometheus-smartctl-exporter diff --git a/kubernetes/apps/observability/smartctl-exporter/app/kustomization.yaml b/kubernetes/apps/observability/smartctl-exporter/app/kustomization.yaml index ef8200884..f26856f47 100644 --- a/kubernetes/apps/observability/smartctl-exporter/app/kustomization.yaml +++ b/kubernetes/apps/observability/smartctl-exporter/app/kustomization.yaml @@ -3,5 +3,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: + - ./helmrepository.yaml - ./helmrelease.yaml - - ./prometheusrule.yaml \ No newline at end of file + - ./prometheusrule.yaml diff --git a/kubernetes/apps/zfs/zfs-scrubber/app/helmrelease.yaml b/kubernetes/apps/zfs/zfs-scrubber/app/helmrelease.yaml index fac4c7aa0..29d8770ce 100644 --- a/kubernetes/apps/zfs/zfs-scrubber/app/helmrelease.yaml +++ b/kubernetes/apps/zfs/zfs-scrubber/app/helmrelease.yaml @@ -5,14 +5,10 @@ metadata: name: zfs-scrubber spec: interval: 30m - chart: - spec: - chart: app-template - version: 3.7.1 - sourceRef: - kind: HelmRepository - name: bjw-s - namespace: flux-system + chartRef: + kind: OCIRepository + name: app-template + namespace: flux-system install: remediation: retries: 3 diff --git a/kubernetes/flux/meta/repositories/helm/bjw-s.yaml b/kubernetes/flux/meta/repositories/helm/bjw-s.yaml deleted file mode 100644 index a40b5d778..000000000 --- a/kubernetes/flux/meta/repositories/helm/bjw-s.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -apiVersion: source.toolkit.fluxcd.io/v1 -kind: HelmRepository -metadata: - name: bjw-s - namespace: flux-system -spec: - type: oci - interval: 5m - url: oci://ghcr.io/bjw-s/helm diff --git a/kubernetes/flux/meta/repositories/helm/cloudnative-pg.yaml b/kubernetes/flux/meta/repositories/helm/cloudnative-pg.yaml deleted file mode 100644 index 4b2f0e615..000000000 --- a/kubernetes/flux/meta/repositories/helm/cloudnative-pg.yaml +++ /dev/null @@ -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: cloudnative-pg - namespace: flux-system -spec: - interval: 2h - url: https://cloudnative-pg.github.io/charts diff --git a/kubernetes/flux/meta/repositories/helm/controlplaneio.yaml b/kubernetes/flux/meta/repositories/helm/controlplaneio.yaml deleted file mode 100644 index 1fdfdb595..000000000 --- a/kubernetes/flux/meta/repositories/helm/controlplaneio.yaml +++ /dev/null @@ -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: controlplaneio - namespace: flux-system -spec: - type: oci - interval: 5m - url: oci://ghcr.io/controlplaneio-fluxcd/charts diff --git a/kubernetes/flux/meta/repositories/helm/coredns.yaml b/kubernetes/flux/meta/repositories/helm/coredns.yaml deleted file mode 100644 index c3488f274..000000000 --- a/kubernetes/flux/meta/repositories/helm/coredns.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -apiVersion: source.toolkit.fluxcd.io/v1 -kind: HelmRepository -metadata: - name: coredns - namespace: flux-system -spec: - type: oci - interval: 30m - url: "oci://ghcr.io/coredns/charts" diff --git a/kubernetes/flux/meta/repositories/helm/external-secrets.yaml b/kubernetes/flux/meta/repositories/helm/external-secrets.yaml deleted file mode 100644 index a2261bd35..000000000 --- a/kubernetes/flux/meta/repositories/helm/external-secrets.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -apiVersion: source.toolkit.fluxcd.io/v1 -kind: HelmRepository -metadata: - name: external-secrets - namespace: flux-system -spec: - type: oci - interval: 30m - url: oci://ghcr.io/external-secrets/charts diff --git a/kubernetes/flux/meta/repositories/helm/kustomization.yaml b/kubernetes/flux/meta/repositories/helm/kustomization.yaml index e727c9f8b..d64200da2 100644 --- a/kubernetes/flux/meta/repositories/helm/kustomization.yaml +++ b/kubernetes/flux/meta/repositories/helm/kustomization.yaml @@ -5,15 +5,10 @@ resources: - ./actions-runner-controller.yaml - ./backube.yaml - ./bitnami.yaml - - ./bjw-s.yaml - ./cilium.yaml - - ./cloudnative-pg.yaml - - ./controlplaneio.yaml - - ./coredns.yaml - ./dcgm-exporter.yaml - ./democratic-csi.yaml - ./external-dns.yaml - - ./external-secrets.yaml - ./fluxcd-community.yaml - ./grafana.yaml - ./headlamp.yaml @@ -28,6 +23,4 @@ resources: - ./openebs.yaml - ./piraeus.yaml - ./postfinance.yaml - - ./prometheus-community.yaml - - ./spegel.yaml - ./stakater.yaml diff --git a/kubernetes/flux/meta/repositories/helm/prometheus-community.yaml b/kubernetes/flux/meta/repositories/helm/prometheus-community.yaml deleted file mode 100644 index 318a1a514..000000000 --- a/kubernetes/flux/meta/repositories/helm/prometheus-community.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -apiVersion: source.toolkit.fluxcd.io/v1 -kind: HelmRepository -metadata: - name: prometheus-community - namespace: flux-system -spec: - type: oci - interval: 5m - url: oci://ghcr.io/prometheus-community/charts diff --git a/kubernetes/flux/meta/repositories/helm/spegel.yaml b/kubernetes/flux/meta/repositories/helm/spegel.yaml deleted file mode 100644 index d9a8b2cd3..000000000 --- a/kubernetes/flux/meta/repositories/helm/spegel.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -apiVersion: source.toolkit.fluxcd.io/v1 -kind: HelmRepository -metadata: - name: spegel - namespace: flux-system -spec: - type: oci - interval: 5m - url: oci://ghcr.io/spegel-org/helm-charts diff --git a/kubernetes/flux/meta/repositories/oci/app-template.yaml b/kubernetes/flux/meta/repositories/oci/app-template.yaml new file mode 100644 index 000000000..c0253ff94 --- /dev/null +++ b/kubernetes/flux/meta/repositories/oci/app-template.yaml @@ -0,0 +1,17 @@ +--- +# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/ocirepository_v1beta2.json +apiVersion: source.toolkit.fluxcd.io/v1beta2 +kind: OCIRepository +metadata: + name: app-template + namespace: flux-system +spec: + interval: 1h + layerSelector: + mediaType: application/vnd.cncf.helm.chart.content.v1.tar+gzip + operation: copy + ref: + tag: 3.7.1 + url: oci://ghcr.io/bjw-s/helm/app-template + verify: + provider: cosign diff --git a/kubernetes/flux/meta/repositories/oci/kustomization.yaml b/kubernetes/flux/meta/repositories/oci/kustomization.yaml index fe0f332a9..2c699eb32 100644 --- a/kubernetes/flux/meta/repositories/oci/kustomization.yaml +++ b/kubernetes/flux/meta/repositories/oci/kustomization.yaml @@ -1,4 +1,5 @@ --- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -resources: [] +resources: + - ./app-template.yaml