From 0496ecf03315fba62441ade5b9c1e94de5999eeb Mon Sep 17 00:00:00 2001
From: shahargl <shaharglazner@gmail.com>
Date: Sun, 8 Sep 2024 17:16:44 +0300
Subject: [PATCH 1/3] feat: more tpl

---
 charts/keep/Chart.yaml                  |  4 ++--
 charts/keep/templates/keep-backend.yaml | 11 +++++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/charts/keep/Chart.yaml b/charts/keep/Chart.yaml
index 0cf0b6e..8465614 100644
--- a/charts/keep/Chart.yaml
+++ b/charts/keep/Chart.yaml
@@ -1,10 +1,10 @@
 apiVersion: v2
 name: keep
-version: 0.1.7
+version: 0.1.8
 description: Keep Helm Chart
 type: application
 icon: https://platform.keephq.dev/_next/image?url=%2Fkeep.png&w=48&q=75
-appVersion: 0.23.0
+appVersion: 0.24.0
 deprecated: false
 annotations:
   app: keep
diff --git a/charts/keep/templates/keep-backend.yaml b/charts/keep/templates/keep-backend.yaml
index 2421cef..d9c8676 100644
--- a/charts/keep/templates/keep-backend.yaml
+++ b/charts/keep/templates/keep-backend.yaml
@@ -18,8 +18,15 @@ spec:
     metadata:
       {{- with .Values.backend.podAnnotations }}
       annotations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
+        {{- if .Values.backend.podAnnotations }}
+        {{- range $key, $value := .Values.backend.podAnnotations }}
+        {{- if kindIs "string" $value }}
+        {{ $key }}: {{ tpl $value $ | quote }}
+        {{- else }}
+        {{ $key }}: {{ $value | toYaml | nindent 8 }}
+        {{- end }}
+        {{- end }}
+        {{- end }}
       labels:
         {{- include "keep.selectorLabels" . | nindent 8 }}
         keep-component: backend

From 8f5136800e6812a29cda074343b9da893329d016 Mon Sep 17 00:00:00 2001
From: shahargl <shaharglazner@gmail.com>
Date: Sun, 8 Sep 2024 17:22:09 +0300
Subject: [PATCH 2/3] feat: fix redundant

---
 charts/keep/templates/keep-backend.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/keep/templates/keep-backend.yaml b/charts/keep/templates/keep-backend.yaml
index d9c8676..ec1b867 100644
--- a/charts/keep/templates/keep-backend.yaml
+++ b/charts/keep/templates/keep-backend.yaml
@@ -141,4 +141,4 @@ spec:
         {{- with .Values.backend.extraVolumes }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
-{{- end }}
+{{- end }}
\ No newline at end of file

From f7bc16ac0e3d59d41f660581de192ddca639c997 Mon Sep 17 00:00:00 2001
From: shahargl <shaharglazner@gmail.com>
Date: Sun, 8 Sep 2024 17:26:05 +0300
Subject: [PATCH 3/3] fix: lint

---
 charts/keep/templates/keep-backend.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/charts/keep/templates/keep-backend.yaml b/charts/keep/templates/keep-backend.yaml
index 581d491..8f235db 100644
--- a/charts/keep/templates/keep-backend.yaml
+++ b/charts/keep/templates/keep-backend.yaml
@@ -27,6 +27,7 @@ spec:
         {{- end }}
         {{- end }}
         {{- end }}
+      {{- end }}
       labels:
         {{- include "keep.selectorLabels" . | nindent 8 }}
         keep-component: backend
@@ -59,8 +60,8 @@ spec:
               {{- else if .configMapKeyRef }}
               valueFrom:
                 configMapKeyRef:
-                  name: {{ tpl (.configMapName | toString) $ }}
-                  key: {{ tpl (.configMapKey | toString) $ }}
+                  name: {{ tpl (.configMapKeyRef.name | toString) $ }}
+                  key: {{ tpl (.configMapKeyRef.key | toString) $ }}
               {{- else if .fieldRef }}
               valueFrom:
                 fieldRef: