feat(Repos): Change some to OCI

Heavybullets8 · Mar 3, 2025 · 81d5a27 · 81d5a27
1 parent 7d96c18
commit 81d5a27
Show file tree

Hide file tree

Showing 79 changed files with 388 additions and 467 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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