From 1337ea33135cc7241c552ca533db81b1e226ecec Mon Sep 17 00:00:00 2001
From: Jameel Al-Aziz <jameel@bastion.io>
Date: Sun, 12 Nov 2023 22:27:43 -0800
Subject: [PATCH 1/2] feat: add support for extra volumes

Add support for extra volumes. This can be useful for mounting files
from k8s secrets and referencing them from the flipt config (e.g. Git
SSH key files).
---
 charts/flipt/templates/deployment.yaml |  6 ++++++
 charts/flipt/values.yaml               | 12 ++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/charts/flipt/templates/deployment.yaml b/charts/flipt/templates/deployment.yaml
index 558a1a1..71838ca 100644
--- a/charts/flipt/templates/deployment.yaml
+++ b/charts/flipt/templates/deployment.yaml
@@ -55,6 +55,9 @@ spec:
             {{- if .Values.persistence.subPath }}
               subPath: {{ .Values.persistence.subPath }}
             {{- end }}
+            {{ if .Values.extraVolumeMounts }}
+            {{- toYaml .Values.extraVolumeMounts | nindent 12 }}
+            {{- end }}
           livenessProbe:
             httpGet:
               path: /health
@@ -80,6 +83,9 @@ spec:
         {{- else }}
           emptyDir: {}
         {{- end }}
+        {{- if .Values.extraVolumes }}
+        {{- toYaml .Values.extraVolumes | nindent 8 }}
+        {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
diff --git a/charts/flipt/values.yaml b/charts/flipt/values.yaml
index 76c6755..a081fef 100644
--- a/charts/flipt/values.yaml
+++ b/charts/flipt/values.yaml
@@ -189,3 +189,15 @@ metrics:
     scheme: http
     # -- ServiceMonitor will use these tlsConfig settings to make the health check requests
     tlsConfig: null
+
+# extraVolumeMounts is a list of extra volumes to mount to the flipt container
+# - name: flipt-git-ssh-key
+#   mountPath: /etc/flipt/ssh.key
+#   subPath: ssh.key
+extraVolumeMounts: []
+
+# extraVolumes is a list of extra volumes to mount to the pod
+# - name: flipt-git-ssh-key
+#   secret:
+#     secretName: flit-git-ssh-key-secret
+extraVolumes: []

From 401c2f24538ae7a08b7f037f254ecfe4371668e3 Mon Sep 17 00:00:00 2001
From: Jameel Al-Aziz <jameel@bastion.io>
Date: Mon, 13 Nov 2023 10:42:26 -0800
Subject: [PATCH 2/2] bump chart version

---
 charts/flipt/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/flipt/Chart.yaml b/charts/flipt/Chart.yaml
index 0dfe34f..483b968 100644
--- a/charts/flipt/Chart.yaml
+++ b/charts/flipt/Chart.yaml
@@ -3,7 +3,7 @@ name: flipt
 home: https://flipt.io
 description: Flipt is an open-source, self-hosted feature flag solution.
 type: application
-version: 0.44.1
+version: 0.44.2
 appVersion: v1.30.1
 maintainers:
   - name: Flipt