From a8d3dfc28529427afb63673aec366823a948d506 Mon Sep 17 00:00:00 2001
From: jakubmatyszewski <jakubmatyszewski1@gmail.com>
Date: Fri, 29 Nov 2024 16:05:41 +0100
Subject: [PATCH] fix(helm): resolve conflict with extraEnv AKHQ_CONFIGURATION
 and ConfigMap configuration

---
 helm/akhq/templates/configmap.yaml |  5 +++++
 helm/akhq/values.yaml              | 12 ++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/helm/akhq/templates/configmap.yaml b/helm/akhq/templates/configmap.yaml
index 9f249e671..9cdcebff8 100644
--- a/helm/akhq/templates/configmap.yaml
+++ b/helm/akhq/templates/configmap.yaml
@@ -1,4 +1,9 @@
 {{- if .Values.configuration }}
+{{- range .Values.extraEnv }}
+{{- if eq .name "AKHQ_CONFIGURATION" }}
+{{- fail "Can't use AKHQ_CONFIGURATION extraEnv together with ConfigMap configuration." }}
+{{- end }}
+{{- end }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
diff --git a/helm/akhq/values.yaml b/helm/akhq/values.yaml
index 53669bc9a..7ac3b7ad4 100644
--- a/helm/akhq/values.yaml
+++ b/helm/akhq/values.yaml
@@ -38,12 +38,12 @@ extraEnv: []
 #   value: "/any/additional/jars/desired.jar:/go/here.jar"
 
 ## Or you can also use configmap for the configuration...
-configuration:
-  akhq:
-    server:
-      access-log:
-        enabled: false
-        name: org.akhq.log.access
+configuration: {}
+  # akhq:
+  #   server:
+  #     access-log:
+  #       enabled: false
+  #       name: org.akhq.log.access
 
 ##... and secret for connection information
 existingSecrets: ""