From be4e840a80e8fde2acbca72cea30a66122a532df Mon Sep 17 00:00:00 2001
From: Iain Sproat <68657+iainsproat@users.noreply.github.com>
Date: Mon, 19 Jun 2023 10:12:58 +0100
Subject: [PATCH] feat(helm): mailchimp is disabled by default

---
 .../templates/server/deployment.yml            | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/utils/helm/speckle-server/templates/server/deployment.yml b/utils/helm/speckle-server/templates/server/deployment.yml
index db513193f..904b26408 100644
--- a/utils/helm/speckle-server/templates/server/deployment.yml
+++ b/utils/helm/speckle-server/templates/server/deployment.yml
@@ -277,24 +277,24 @@ spec:
             value: "{{ .Values.server.email.from }}"
           {{- end }}
           
-          # *** Mailchimp ***
-          
+          # *** Newsletter ***
+          {{- if (default false (.Values.server.mailchimp).enabled) }}
           - name: MAILCHIMP_API_KEY
             valueFrom:
               secretKeyRef:
-                name: {{ default .Values.secretName .Values.server.mailchimp.apikey.secretName }}
-                key: {{ default "mailchimp_apikey" .Values.server.mailchimp.apikey.secretKey }}
+                name: {{ default .Values.secretName ((.Values.server.mailchimp).apikey).secretName }}
+                key: {{ default "mailchimp_apikey" ((.Values.server.mailchimp).apikey).secretKey }}
           - name: MAILCHIMP_SERVER_PREFIX
             valueFrom:
               secretKeyRef:
-                name: {{ default .Values.secretName .Values.server.mailchimp.serverprefix.secretName }}
-                key: {{ default "mailchimp_serverprefix" .Values.server.mailchimp.serverprefix.secretKey }}
+                name: {{ default .Values.secretName ((.Values.server.mailchimp).serverprefix).secretName }}
+                key: {{ default "mailchimp_serverprefix" ((.Values.server.mailchimp).serverprefix).secretKey }}
           - name: MAILCHIMP_LIST_ID
             valueFrom:
               secretKeyRef:
-                name: {{ default .Values.secretName .Values.server.mailchimp.listid.secretName }}
-                key: {{ default "mailchimp_listid" .Values.server.mailchimp.listid.secretKey }}
-
+                name: {{ default .Values.secretName ((.Values.server.mailchimp).listid).secretName }}
+                key: {{ default "mailchimp_listid" ((.Values.server.mailchimp).listid).secretKey }}
+          {{- end }}
 
           # *** Tracking / Tracing ***
           - name: SENTRY_DSN