From 744c654213a42b30c9121e1398a7996b054b971f Mon Sep 17 00:00:00 2001
From: Tommy <tommy@rodl.no>
Date: Sun, 29 Oct 2023 15:41:22 +0100
Subject: [PATCH] Try hardcoding the group, since that's the group in the
 external Conduit image.

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

diff --git a/charts/conduit/Chart.yaml b/charts/conduit/Chart.yaml
index 353f6b8..d35195f 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.7
+version: 0.2.8
 appVersion: "0.6.0"
diff --git a/charts/conduit/templates/deployment.yaml b/charts/conduit/templates/deployment.yaml
index 12ff1c7..4b81e4b 100644
--- a/charts/conduit/templates/deployment.yaml
+++ b/charts/conduit/templates/deployment.yaml
@@ -33,10 +33,9 @@ spec:
       {{- end }}
       serviceAccountName: {{ include "conduit.serviceAccountName" . }}
       securityContext:
-        {{- if .Values.persistence.enabled }}
+        # the conduit group is 1000 in the image
+        # set fsGroup to allow write to PVC
         fsGroup: 1000
-        {{- end }}
-        {{- toYaml .Values.podSecurityContext | nindent 8 }}
       containers:
         - name: {{ .Chart.Name }}
           securityContext:
diff --git a/charts/conduit/values.yaml b/charts/conduit/values.yaml
index 2fd519c..e8ed20d 100644
--- a/charts/conduit/values.yaml
+++ b/charts/conduit/values.yaml
@@ -42,9 +42,6 @@ conduit:
 podLabels: {}
 podAnnotations: {}
 
-podSecurityContext: {}
-  # fsGroup: 2000
-
 securityContext: {}
   # capabilities:
   #   drop: