From 2bd58d07120cdf05e7375cf1c1838bdaf9cdb38a Mon Sep 17 00:00:00 2001
From: Tommy <tommy@rodl.no>
Date: Sun, 29 Oct 2023 15:28:37 +0100
Subject: [PATCH] Fix error with duplicate securitycontext entries.

---
 charts/conduit/Chart.yaml                | 2 +-
 charts/conduit/templates/deployment.yaml | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/charts/conduit/Chart.yaml b/charts/conduit/Chart.yaml
index c1df871..353f6b8 100644
--- a/charts/conduit/Chart.yaml
+++ b/charts/conduit/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: conduit
 description: Conduit is a simple, fast and reliable chat server powered by Matrix.
 type: application
-version: 0.2.6
+version: 0.2.7
 appVersion: "0.6.0"
diff --git a/charts/conduit/templates/deployment.yaml b/charts/conduit/templates/deployment.yaml
index 330f0f8..12ff1c7 100644
--- a/charts/conduit/templates/deployment.yaml
+++ b/charts/conduit/templates/deployment.yaml
@@ -33,6 +33,9 @@ spec:
       {{- end }}
       serviceAccountName: {{ include "conduit.serviceAccountName" . }}
       securityContext:
+        {{- if .Values.persistence.enabled }}
+        fsGroup: 1000
+        {{- end }}
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       containers:
         - name: {{ .Chart.Name }}
@@ -117,7 +120,4 @@ spec:
           persistentVolumeClaim:
             claimName: {{ template "conduit.fullname" . }}
         {{- end }}
-      {{- if .Values.persistence.enabled }}
-      securityContext:
-        fsGroup: 1000
-      {{- end }}
\ No newline at end of file
+