From a80e515d12a577315f806c9b00fc7783ab3e45f5 Mon Sep 17 00:00:00 2001
From: Iain Sproat <68657+iainsproat@users.noreply.github.com>
Date: Thu, 7 Nov 2024 12:35:25 +0000
Subject: [PATCH] fix(helm chart): provide service account with access to
 multi-region  (#3457)

---
 .../templates/fileimport_service/serviceaccount.yml           | 3 +++
 .../speckle-server/templates/monitoring/serviceaccount.yml    | 3 +++
 .../helm/speckle-server/templates/objects/serviceaccount.yml  | 4 +++-
 .../templates/preview_service/serviceaccount.yml              | 3 +++
 utils/helm/speckle-server/templates/server/serviceaccount.yml | 3 +++
 .../templates/webhook_service/serviceaccount.yml              | 3 +++
 6 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/utils/helm/speckle-server/templates/fileimport_service/serviceaccount.yml b/utils/helm/speckle-server/templates/fileimport_service/serviceaccount.yml
index 1dd32b1ed..6e388f19f 100644
--- a/utils/helm/speckle-server/templates/fileimport_service/serviceaccount.yml
+++ b/utils/helm/speckle-server/templates/fileimport_service/serviceaccount.yml
@@ -11,4 +11,7 @@ metadata:
 automountServiceAccountToken: false
 secrets:
   - name: {{ default .Values.secretName .Values.db.connectionString.secretName }}
+{{- if .Values.featureFlags.workspacesMultiRegionEnabled }}
+  - name: {{ default .Values.secretName .Values.multiRegion.config.secretName }}
+{{- end }}
 {{- end -}}
diff --git a/utils/helm/speckle-server/templates/monitoring/serviceaccount.yml b/utils/helm/speckle-server/templates/monitoring/serviceaccount.yml
index facbd525e..a323d6531 100644
--- a/utils/helm/speckle-server/templates/monitoring/serviceaccount.yml
+++ b/utils/helm/speckle-server/templates/monitoring/serviceaccount.yml
@@ -11,4 +11,7 @@ metadata:
 automountServiceAccountToken: false
 secrets:
   - name: {{ default .Values.secretName .Values.db.connectionString.secretName }}
+{{- if .Values.featureFlags.workspacesMultiRegionEnabled }}
+  - name: {{ default .Values.secretName .Values.multiRegion.config.secretName }}
+{{- end }}
 {{- end -}}
diff --git a/utils/helm/speckle-server/templates/objects/serviceaccount.yml b/utils/helm/speckle-server/templates/objects/serviceaccount.yml
index ecd4da60f..3d8b51f45 100644
--- a/utils/helm/speckle-server/templates/objects/serviceaccount.yml
+++ b/utils/helm/speckle-server/templates/objects/serviceaccount.yml
@@ -38,5 +38,7 @@ secrets:
 {{- if .Values.featureFlags.workspaceModuleEnabled }}
   - name: {{ default .Values.secretName .Values.server.licenseTokenSecret.secretName }}
 {{- end }}
-
+{{- if .Values.featureFlags.workspacesMultiRegionEnabled }}
+  - name: {{ default .Values.secretName .Values.multiRegion.config.secretName }}
+{{- end }}
 {{- end -}}
diff --git a/utils/helm/speckle-server/templates/preview_service/serviceaccount.yml b/utils/helm/speckle-server/templates/preview_service/serviceaccount.yml
index 0d7cd7326..e51278e2e 100644
--- a/utils/helm/speckle-server/templates/preview_service/serviceaccount.yml
+++ b/utils/helm/speckle-server/templates/preview_service/serviceaccount.yml
@@ -11,4 +11,7 @@ metadata:
 automountServiceAccountToken: false
 secrets:
   - name: {{ default .Values.secretName .Values.db.connectionString.secretName }}
+{{- if .Values.featureFlags.workspacesMultiRegionEnabled }}
+  - name: {{ default .Values.secretName .Values.multiRegion.config.secretName }}
+{{- end }}
 {{- end -}}
diff --git a/utils/helm/speckle-server/templates/server/serviceaccount.yml b/utils/helm/speckle-server/templates/server/serviceaccount.yml
index c1895c233..c24cdd0cb 100644
--- a/utils/helm/speckle-server/templates/server/serviceaccount.yml
+++ b/utils/helm/speckle-server/templates/server/serviceaccount.yml
@@ -38,5 +38,8 @@ secrets:
 {{- if .Values.featureFlags.workspaceModuleEnabled }}
   - name: {{ default .Values.secretName .Values.server.licenseTokenSecret.secretName }}
 {{- end }}
+{{- if .Values.featureFlags.workspacesMultiRegionEnabled }}
+  - name: {{ default .Values.secretName .Values.multiRegion.config.secretName }}
+{{- end }}
 
 {{- end -}}
diff --git a/utils/helm/speckle-server/templates/webhook_service/serviceaccount.yml b/utils/helm/speckle-server/templates/webhook_service/serviceaccount.yml
index f2e8df4fe..15f01107a 100644
--- a/utils/helm/speckle-server/templates/webhook_service/serviceaccount.yml
+++ b/utils/helm/speckle-server/templates/webhook_service/serviceaccount.yml
@@ -11,4 +11,7 @@ metadata:
 automountServiceAccountToken: false
 secrets:
   - name: {{ ( default .Values.secretName .Values.db.connectionString.secretName ) }}
+{{- if .Values.featureFlags.workspacesMultiRegionEnabled }}
+  - name: {{ default .Values.secretName .Values.multiRegion.config.secretName }}
+{{- end }}
 {{- end -}}