From d736f81a5edc8b62c9aa309d7fc120f5889c1c92 Mon Sep 17 00:00:00 2001
From: WrenIX <dev@wrenix.eu>
Date: Wed, 12 Feb 2025 17:40:59 +0100
Subject: [PATCH] fix(infra-logging): loki do not deploy crds

---
 infra-logging/templates/logging-operator/release.yaml | 2 +-
 infra-logging/templates/loki/release.yaml             | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/infra-logging/templates/logging-operator/release.yaml b/infra-logging/templates/logging-operator/release.yaml
index 430d674..9439db0 100644
--- a/infra-logging/templates/logging-operator/release.yaml
+++ b/infra-logging/templates/logging-operator/release.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: helm.toolkit.fluxcd.io/v2beta2
+apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: logging-operator
diff --git a/infra-logging/templates/loki/release.yaml b/infra-logging/templates/loki/release.yaml
index b8e2f6b..ec99d05 100644
--- a/infra-logging/templates/loki/release.yaml
+++ b/infra-logging/templates/loki/release.yaml
@@ -1,6 +1,6 @@
 {{- if .Values.loki.enabled }}
 ---
-apiVersion: helm.toolkit.fluxcd.io/v2beta2
+apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: loki
@@ -12,11 +12,11 @@ spec:
         name: grafana
       chart: loki
   install:
-    {{- toYaml .Values.commons.helm.release.install | nindent 4 }}
+    {{- deepCopy .Values.commons.helm.release.install | merge (dict "crds" "Skip") | toYaml | nindent 4 }}
   test:
     {{- toYaml .Values.commons.helm.release.test | nindent 4 }}
   upgrade:
-    {{- toYaml .Values.commons.helm.release.upgrade | nindent 4 }}
+    {{- deepCopy .Values.commons.helm.release.upgrade | merge (dict "crds" "Skip") | toYaml | nindent 4 }}
   driftDetection:
     {{- toYaml .Values.commons.helm.release.driftDetection | nindent 4 }}
   interval: 10m