From 94af8edee76a735fe286a3aa0eb585ef16359e43 Mon Sep 17 00:00:00 2001
From: Dreaded_X <tim@huizinga.dev>
Date: Wed, 24 Dec 2025 03:12:01 +0100
Subject: [PATCH] chore: Consistent use of oci helm release

---
 controllers/cert-manager/helm-release.yaml    | 11 ++++++++---
 controllers/cert-manager/helm-repository.yaml |  9 +++++++++
 controllers/cert-manager/kustomization.yaml   |  2 +-
 controllers/cert-manager/oci-repository.yaml  | 13 -------------
 4 files changed, 18 insertions(+), 17 deletions(-)
 create mode 100644 controllers/cert-manager/helm-repository.yaml
 delete mode 100644 controllers/cert-manager/oci-repository.yaml

diff --git a/controllers/cert-manager/helm-release.yaml b/controllers/cert-manager/helm-release.yaml
index f4770d0..9da74c1 100644
--- a/controllers/cert-manager/helm-release.yaml
+++ b/controllers/cert-manager/helm-release.yaml
@@ -13,9 +13,14 @@ spec:
     strategy:
       name: RetryOnFailure
       retryInterval: 3m
-  chartRef:
-    kind: OCIRepository
-    name: cert-manager
+  chart:
+    spec:
+      chart: cert-manager
+      version: "1.19.x"
+      sourceRef:
+        kind: HelmRepository
+        name: cert-manager
+      interval: 24h
   values:
     crds:
       enabled: true
diff --git a/controllers/cert-manager/helm-repository.yaml b/controllers/cert-manager/helm-repository.yaml
new file mode 100644
index 0000000..cce098f
--- /dev/null
+++ b/controllers/cert-manager/helm-repository.yaml
@@ -0,0 +1,9 @@
+apiVersion: source.toolkit.fluxcd.io/v1
+kind: HelmRepository
+metadata:
+  name: cert-manager
+  namespace: cert-manager
+spec:
+  type: "oci"
+  interval: 24h
+  url: oci://quay.io/jetstack/charts/
diff --git a/controllers/cert-manager/kustomization.yaml b/controllers/cert-manager/kustomization.yaml
index e1ead33..4c991cb 100644
--- a/controllers/cert-manager/kustomization.yaml
+++ b/controllers/cert-manager/kustomization.yaml
@@ -2,5 +2,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ./namespace.yaml
-  - ./oci-repository.yaml
+  - ./helm-repository.yaml
   - ./helm-release.yaml
diff --git a/controllers/cert-manager/oci-repository.yaml b/controllers/cert-manager/oci-repository.yaml
deleted file mode 100644
index 8dde977..0000000
--- a/controllers/cert-manager/oci-repository.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-apiVersion: source.toolkit.fluxcd.io/v1
-kind: OCIRepository
-metadata:
-  name: cert-manager
-  namespace: cert-manager
-spec:
-  interval: 24h
-  url: oci://quay.io/jetstack/charts/cert-manager
-  layerSelector:
-    mediaType: "application/vnd.cncf.helm.chart.content.v1.tar+gzip"
-    operation: copy
-  ref:
-    semver: "1.19.x"