From e1d8051c7f765f468d756fa51efe5b7b9c313fef Mon Sep 17 00:00:00 2001
From: Artem Timchenko <artem.timchenko@bolt.eu>
Date: Fri, 19 Apr 2024 14:53:04 +0300
Subject: [PATCH] feature-9: add-yamlApplicationConfigSecret

---
 charts/kafka-ui/templates/deployment.yaml | 19 +++++++++++++++----
 charts/kafka-ui/values.yaml               |  5 +++++
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/charts/kafka-ui/templates/deployment.yaml b/charts/kafka-ui/templates/deployment.yaml
index ea46341..9519137 100644
--- a/charts/kafka-ui/templates/deployment.yaml
+++ b/charts/kafka-ui/templates/deployment.yaml
@@ -48,17 +48,19 @@ spec:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: {{ include "kafka-ui.imageName" . }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
-          {{- if or .Values.env  .Values.yamlApplicationConfig .Values.yamlApplicationConfigConfigMap}}
+          {{- if or .Values.env  .Values.yamlApplicationConfig .Values.yamlApplicationConfigConfigMap .Values.yamlApplicationConfigSecret }}
           env:
             {{- with .Values.env }}
               {{- toYaml . | nindent 12 }}
             {{- end }}
-            {{- if or .Values.yamlApplicationConfig .Values.yamlApplicationConfigConfigMap}}
+            {{- if or .Values.yamlApplicationConfig .Values.yamlApplicationConfigConfigMap .Values.yamlApplicationConfigSecret }}
             - name: SPRING_CONFIG_ADDITIONAL-LOCATION
               {{- if .Values.yamlApplicationConfig }}
               value: /kafka-ui/config.yml
               {{- else if .Values.yamlApplicationConfigConfigMap }}
               value: /kafka-ui/{{ .Values.yamlApplicationConfigConfigMap.keyName | default "config.yml" }}
+              {{- else if .Values.yamlApplicationConfigSecret }}
+              value: /kafka-ui/{{ .Values.yamlApplicationConfigSecret.keyName | default "config.yml" }}
               {{- end }}
             {{- end }}
           {{- end }}
@@ -107,7 +109,7 @@ spec:
             timeoutSeconds: 10
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
-          {{- if or .Values.yamlApplicationConfig .Values.volumeMounts .Values.yamlApplicationConfigConfigMap}}
+          {{- if or .Values.yamlApplicationConfig .Values.volumeMounts .Values.yamlApplicationConfigConfigMap .Values.yamlApplicationConfigSecret }}
           volumeMounts:
             {{- with .Values.volumeMounts }} 
               {{- toYaml . | nindent 12 }}
@@ -120,8 +122,12 @@ spec:
             - name: kafka-ui-yaml-conf-configmap
               mountPath: /kafka-ui/
             {{- end }}
+            {{- if .Values.yamlApplicationConfigSecret}}
+            - name: kafka-ui-yaml-conf-secret
+              mountPath: /kafka-ui/
+            {{- end }}
           {{- end }}
-      {{- if or .Values.yamlApplicationConfig .Values.volumes .Values.yamlApplicationConfigConfigMap}}
+      {{- if or .Values.yamlApplicationConfig .Values.volumes .Values.yamlApplicationConfigConfigMap .Values.yamlApplicationConfigSecret }}
       volumes:
         {{- with .Values.volumes }}
           {{- toYaml . | nindent 8 }}
@@ -136,6 +142,11 @@ spec:
           configMap: 
             name: {{ .Values.yamlApplicationConfigConfigMap.name }}
         {{- end }}
+        {{- if .Values.yamlApplicationConfigSecret}}
+        - name: kafka-ui-yaml-conf-secret
+          secret:
+            secretName: {{ .Values.yamlApplicationConfigSecret.name }}
+        {{- end }}
       {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
diff --git a/charts/kafka-ui/values.yaml b/charts/kafka-ui/values.yaml
index 0388bcb..2552621 100644
--- a/charts/kafka-ui/values.yaml
+++ b/charts/kafka-ui/values.yaml
@@ -40,6 +40,11 @@ yamlApplicationConfigConfigMap:
   {}
   # keyName: config.yml
   # name: configMapName
+yamlApplicationConfigSecret:
+  {}
+  # keyName: config.yml
+  # name: secretName
+
 existingSecret: ""
 envs:
   secret: {}