From 01450de54d03cf2abdf6c024fa2d239e6b66791d Mon Sep 17 00:00:00 2001
From: Iain Sproat <68657+iainsproat@users.noreply.github.com>
Date: Thu, 7 Nov 2024 13:20:05 +0000
Subject: [PATCH] fix(helm chart): root is read-only so mount volume to
 specific directory (#3458)

* fix(helm chart): mount correct path

* fix(helm chart): root is read-only so mount volume to specific directory
---
 utils/helm/speckle-server/templates/_helpers.tpl            | 2 +-
 .../templates/fileimport_service/deployment.yml             | 6 +++---
 .../helm/speckle-server/templates/monitoring/deployment.yml | 6 +++---
 utils/helm/speckle-server/templates/objects/deployment.yml  | 2 +-
 .../speckle-server/templates/preview_service/deployment.yml | 6 +++---
 utils/helm/speckle-server/templates/server/deployment.yml   | 4 ++--
 .../speckle-server/templates/webhook_service/deployment.yml | 6 +++---
 7 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/utils/helm/speckle-server/templates/_helpers.tpl b/utils/helm/speckle-server/templates/_helpers.tpl
index 86ce61e71..16b83b4c3 100644
--- a/utils/helm/speckle-server/templates/_helpers.tpl
+++ b/utils/helm/speckle-server/templates/_helpers.tpl
@@ -1063,6 +1063,6 @@ Generate the environment variables for Speckle server and Speckle objects deploy
 {{- end }}
 {{- if .Values.featureFlags.workspacesMultiRegionEnabled }}
 - name: MULTI_REGION_CONFIG_PATH
-  value: {{ (printf "/%s" .Values.multiRegion.config.secretKey) | quote}}
+  value: "/multi-region-config/multi-region-config.json"
 {{- end }}
 {{- end }}
diff --git a/utils/helm/speckle-server/templates/fileimport_service/deployment.yml b/utils/helm/speckle-server/templates/fileimport_service/deployment.yml
index 89dec98b3..108120db4 100644
--- a/utils/helm/speckle-server/templates/fileimport_service/deployment.yml
+++ b/utils/helm/speckle-server/templates/fileimport_service/deployment.yml
@@ -65,7 +65,7 @@ spec:
         {{- end }}
         {{- if .Values.featureFlags.workspacesMultiRegionEnabled }}
           - name: multi-region-config
-            mountPath: /
+            mountPath: /multi-region-config
             readOnly: true
         {{- end }}
 
@@ -98,7 +98,7 @@ spec:
           - name: FF_WORKSPACES_MULTI_REGION_ENABLED
             value: {{ .Values.featureFlags.workspacesMultiRegionEnabled | quote }}
           - name: MULTI_REGION_CONFIG_PATH
-            value: {{ (printf "/%s" .Values.multiRegion.config.secretKey) | quote}}
+            value: "/multi-region-config/multi-region-config.json"
           {{- end }}
       {{- if .Values.fileimport_service.affinity }}
       affinity: {{- include "speckle.renderTpl" (dict "value" .Values.fileimport_service.affinity "context" $) | nindent 8 }}
@@ -141,6 +141,6 @@ spec:
             secretName: {{ .Values.multiRegion.config.secretName }}
             items:
             - key: {{ .Values.multiRegion.config.secretKey }}
-              path: "."
+              path: "multi-region-config.json"
       {{- end }}
 {{- end }}
diff --git a/utils/helm/speckle-server/templates/monitoring/deployment.yml b/utils/helm/speckle-server/templates/monitoring/deployment.yml
index 97b55e0e3..725edf377 100644
--- a/utils/helm/speckle-server/templates/monitoring/deployment.yml
+++ b/utils/helm/speckle-server/templates/monitoring/deployment.yml
@@ -53,7 +53,7 @@ spec:
         {{- end }}
         {{- if .Values.featureFlags.workspacesMultiRegionEnabled }}
           - name: multi-region-config
-            mountPath: /
+            mountPath: /multi-region-config
             readOnly: true
         {{- end }}
 
@@ -72,7 +72,7 @@ spec:
           - name: FF_WORKSPACES_MULTI_REGION_ENABLED
             value: {{ .Values.featureFlags.workspacesMultiRegionEnabled | quote }}
           - name: MULTI_REGION_CONFIG_PATH
-            value: {{ (printf "/%s" .Values.multiRegion.config.secretKey) | quote}}
+            value: "/multi-region-config/multi-region-config.json"
           {{- end }}
 
           - name: LOG_LEVEL
@@ -106,7 +106,7 @@ spec:
             secretName: {{ .Values.multiRegion.config.secretName }}
             items:
             - key: {{ .Values.multiRegion.config.secretKey }}
-              path: "."
+              path: "multi-region-config.json"
       {{- end }}
 
       {{- if .Values.monitoring.affinity }}
diff --git a/utils/helm/speckle-server/templates/objects/deployment.yml b/utils/helm/speckle-server/templates/objects/deployment.yml
index 4f050ff42..168f3a193 100644
--- a/utils/helm/speckle-server/templates/objects/deployment.yml
+++ b/utils/helm/speckle-server/templates/objects/deployment.yml
@@ -148,5 +148,5 @@ spec:
             secretName: {{ .Values.multiRegion.config.secretName }}
             items:
             - key: {{ .Values.multiRegion.config.secretKey }}
-              path: "."
+              path: "multi-region-config.json"
       {{- end }}
diff --git a/utils/helm/speckle-server/templates/preview_service/deployment.yml b/utils/helm/speckle-server/templates/preview_service/deployment.yml
index 3ebfb66c7..043acdf76 100644
--- a/utils/helm/speckle-server/templates/preview_service/deployment.yml
+++ b/utils/helm/speckle-server/templates/preview_service/deployment.yml
@@ -62,7 +62,7 @@ spec:
         {{- end }}
         {{- if .Values.featureFlags.workspacesMultiRegionEnabled }}
           - name: multi-region-config
-            mountPath: /
+            mountPath: /multi-region-config
             readOnly: true
         {{- end }}
 
@@ -106,7 +106,7 @@ spec:
           - name: FF_WORKSPACES_MULTI_REGION_ENABLED
             value: {{ .Values.featureFlags.workspacesMultiRegionEnabled | quote }}
           - name: MULTI_REGION_CONFIG_PATH
-            value: {{ (printf "/%s" .Values.multiRegion.config.secretKey) | quote}}
+            value: "/multi-region-config/multi-region-config.json"
           {{- end }}
 
       {{- if .Values.preview_service.affinity }}
@@ -150,5 +150,5 @@ spec:
             secretName: {{ .Values.multiRegion.config.secretName }}
             items:
             - key: {{ .Values.multiRegion.config.secretKey }}
-              path: "."
+              path: "multi-region-config.json"
       {{- end }}
diff --git a/utils/helm/speckle-server/templates/server/deployment.yml b/utils/helm/speckle-server/templates/server/deployment.yml
index 6cc35cf2a..b397fe95b 100644
--- a/utils/helm/speckle-server/templates/server/deployment.yml
+++ b/utils/helm/speckle-server/templates/server/deployment.yml
@@ -64,7 +64,7 @@ spec:
         {{- end }}
         {{- if .Values.featureFlags.workspacesMultiRegionEnabled }}
           - name: multi-region-config
-            mountPath: /
+            mountPath: /multi-region-config
             readOnly: true
         {{- end }}
 
@@ -148,5 +148,5 @@ spec:
             secretName: {{ .Values.multiRegion.config.secretName }}
             items:
             - key: {{ .Values.multiRegion.config.secretKey }}
-              path: "."
+              path: "multi-region-config.json"
       {{- end }}
diff --git a/utils/helm/speckle-server/templates/webhook_service/deployment.yml b/utils/helm/speckle-server/templates/webhook_service/deployment.yml
index 8b71ce404..7637fa7ee 100644
--- a/utils/helm/speckle-server/templates/webhook_service/deployment.yml
+++ b/utils/helm/speckle-server/templates/webhook_service/deployment.yml
@@ -64,7 +64,7 @@ spec:
         {{- end }}
         {{- if .Values.featureFlags.workspacesMultiRegionEnabled }}
           - name: multi-region-config
-            mountPath: /
+            mountPath: /multi-region-config
             readOnly: true
         {{- end }}
 
@@ -88,7 +88,7 @@ spec:
           - name: FF_WORKSPACES_MULTI_REGION_ENABLED
             value: {{ .Values.featureFlags.workspacesMultiRegionEnabled | quote }}
           - name: MULTI_REGION_CONFIG_PATH
-            value: {{ (printf "/%s" .Values.multiRegion.config.secretKey) | quote}}
+            value: "/multi-region-config/multi-region-config.json"
           {{- end }}
 
       {{- if .Values.webhook_service.affinity }}
@@ -135,5 +135,5 @@ spec:
             secretName: {{ .Values.multiRegion.config.secretName }}
             items:
             - key: {{ .Values.multiRegion.config.secretKey }}
-              path: "."
+              path: "multi-region-config.json"
       {{- end }}