From 7c2db7888f3b700b6048a71e14fdb2790ede0c7e Mon Sep 17 00:00:00 2001
From: shahargl <shaharglazner@gmail.com>
Date: Tue, 3 Sep 2024 09:13:03 +0300
Subject: [PATCH 1/2] feat: add tpl to env vars

---
 charts/keep/Chart.yaml                           | 2 +-
 charts/keep/templates/frontend-ingress.yaml      | 5 ++++-
 charts/keep/templates/keep-frontend-service.yaml | 5 ++++-
 charts/keep/templates/keep-frontend.yaml         | 5 ++++-
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/charts/keep/Chart.yaml b/charts/keep/Chart.yaml
index bc656af..190c189 100644
--- a/charts/keep/Chart.yaml
+++ b/charts/keep/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: keep
-version: 0.1.6
+version: 0.1.7
 description: Keep Helm Chart
 type: application
 icon: https://platform.keephq.dev/_next/image?url=%2Fkeep.png&w=48&q=75
diff --git a/charts/keep/templates/frontend-ingress.yaml b/charts/keep/templates/frontend-ingress.yaml
index be3736c..48c01f8 100644
--- a/charts/keep/templates/frontend-ingress.yaml
+++ b/charts/keep/templates/frontend-ingress.yaml
@@ -58,4 +58,7 @@ spec:
               {{- end }}
           {{- end }}
     {{- end }}
-{{- end }}
+  {{- if .Values.frontend.extraIngress }}
+  {{ toYaml .Values.frontend.extraIngress | nindent 2 }}
+  {{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/charts/keep/templates/keep-frontend-service.yaml b/charts/keep/templates/keep-frontend-service.yaml
index 7c16067..9a21a31 100644
--- a/charts/keep/templates/keep-frontend-service.yaml
+++ b/charts/keep/templates/keep-frontend-service.yaml
@@ -16,7 +16,10 @@ spec:
       {{ if eq .Values.frontend.service.type "NodePort" }}
       nodePort: {{ .Values.frontend.service.nodePort }}
       {{- end }}
+    {{- if .Values.frontend.extraPorts }}
+    {{- toYaml .Values.frontend.extraPorts | nindent 4 }}
+    {{- end }}
   selector:
     {{- include "keep.selectorLabels" . | nindent 4 }}
     keep-component: frontend
-{{- end}}
+{{- end}}
\ No newline at end of file
diff --git a/charts/keep/templates/keep-frontend.yaml b/charts/keep/templates/keep-frontend.yaml
index 4e56728..6b081d7 100644
--- a/charts/keep/templates/keep-frontend.yaml
+++ b/charts/keep/templates/keep-frontend.yaml
@@ -55,6 +55,9 @@ spec:
           {{- end }}
           resources:
             {{- toYaml .Values.frontend.resources | nindent 12 }}
+      {{- if .Values.frontend.extraContainers }}
+      {{ toYaml .Values.frontend.extraContainers | nindent 6 }}
+      {{- end }}
       {{- with .Values.frontend.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
@@ -70,4 +73,4 @@ spec:
       volumes:
         - name: state-volume
           emptyDir: {}
-{{- end }}
+{{- end }}
\ No newline at end of file

From a1e0bf6df31c13322cd14ca7d7c18ffd21731b87 Mon Sep 17 00:00:00 2001
From: shahargl <shaharglazner@gmail.com>
Date: Tue, 3 Sep 2024 13:34:27 +0300
Subject: [PATCH 2/2] feat: add tpl to env vars

---
 charts/keep/Chart.yaml                      | 2 +-
 charts/keep/templates/frontend-ingress.yaml | 2 +-
 charts/keep/templates/keep-frontend.yaml    | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/charts/keep/Chart.yaml b/charts/keep/Chart.yaml
index 190c189..0cf0b6e 100644
--- a/charts/keep/Chart.yaml
+++ b/charts/keep/Chart.yaml
@@ -4,7 +4,7 @@ version: 0.1.7
 description: Keep Helm Chart
 type: application
 icon: https://platform.keephq.dev/_next/image?url=%2Fkeep.png&w=48&q=75
-appVersion: 0.21.0
+appVersion: 0.23.0
 deprecated: false
 annotations:
   app: keep
diff --git a/charts/keep/templates/frontend-ingress.yaml b/charts/keep/templates/frontend-ingress.yaml
index 48c01f8..c113f3f 100644
--- a/charts/keep/templates/frontend-ingress.yaml
+++ b/charts/keep/templates/frontend-ingress.yaml
@@ -58,7 +58,7 @@ spec:
               {{- end }}
           {{- end }}
     {{- end }}
-  {{- if .Values.frontend.extraIngress }}
+  {{- if .Values.frontend.extraIngress -}}
   {{ toYaml .Values.frontend.extraIngress | nindent 2 }}
   {{- end }}
 {{- end }}
\ No newline at end of file
diff --git a/charts/keep/templates/keep-frontend.yaml b/charts/keep/templates/keep-frontend.yaml
index 6b081d7..e323875 100644
--- a/charts/keep/templates/keep-frontend.yaml
+++ b/charts/keep/templates/keep-frontend.yaml
@@ -55,8 +55,8 @@ spec:
           {{- end }}
           resources:
             {{- toYaml .Values.frontend.resources | nindent 12 }}
-      {{- if .Values.frontend.extraContainers }}
-      {{ toYaml .Values.frontend.extraContainers | nindent 6 }}
+      {{- if .Values.frontend.extraContainers -}}
+      {{ toYaml .Values.frontend.extraContainers | nindent 8 }}
       {{- end }}
       {{- with .Values.frontend.nodeSelector }}
       nodeSelector: