Merge branch '49-change-envs-in-charts' into 'develop'

Resolve "Change envs in charts" Closes #49 See merge request ch/mail-templater!72
containerum · Oct 15, 2018 · e094d91 · e094d91
2 parents 7e77a79 + 55b08ea
commit e094d91
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 25 deletions.
diff --git a/charts/mail/templates/deployment.yaml b/charts/mail/templates/deployment.yaml
@@ -28,15 +28,15 @@ spec:
             - name: {{ $key  }}
               value: {{ $val | quote }}
             {{- end }}
-            {{- if .Values.env.local.CH_MAIL_USER_MANAGER_URL }}
-            - name: CH_MAIL_USER_MANAGER_URL
-              value: "{{ .Values.env.local.CH_MAIL_USER_MANAGER_URL }}"
+            {{- if .Values.env.local.USER_MANAGER_URL }}
+            - name: USER_MANAGER_URL
+              value: "{{ .Values.env.local.USER_MANAGER_URL }}"
             {{- else }}
-            - name: CH_MAIL_USER_MANAGER_URL
+            - name: USER_MANAGER_URL
               value: "http://{{ .Release.Name }}-user-manager:8111"
             {{- end }}
-            {{- if .Values.env.local.CH_MAIL_SMTP_PASSWORD }}
-            - name: CH_MAIL_SMTP_PASSWORD
+            {{- if .Values.env.local.SMTP_PASSWORD }}
+            - name: SMTP_PASSWORD
               valueFrom:
                 secretKeyRef:
                   name: {{ template "fullname" . }}

diff --git a/charts/mail/templates/secret.yaml b/charts/mail/templates/secret.yaml
@@ -9,9 +9,9 @@ metadata:
     heritage: {{ .Release.Service }}
 type: Opaque
 data:
-  {{- if .Values.env.local.CH_MAIL_SMTP_PASSWORD }}
-  smtp-password: {{ .Values.env.local.CH_MAIL_SMTP_PASSWORD | b64enc }}
+  {{- if .Values.env.local.SMTP_PASSWORD }}
+  smtp-password: {{ .Values.env.local.SMTP_PASSWORD | b64enc }}
   {{- end }}
-  {{- if .Values.env.local.CH_MAIL_MG_PASSWORD }}
-  mailgun-password: {{ .Values.env.local.CH_MAIL_MG_PASSWORD | b64enc }}
+  {{- if .Values.env.local.MG_PASSWORD }}
+  mailgun-password: {{ .Values.env.local.MG_PASSWORD | b64enc }}
   {{- end }}
diff --git a/charts/mail/values.yaml b/charts/mail/values.yaml
@@ -34,19 +34,18 @@ persistence:
 env:
   global:
     GIN_MODE: debug
-    CH_MAIL_LOG_LEVEL: 4
-    CH_MAIL_TEMPLATE_DB: "/storage/template.db"
-    CH_MAIL_MESSAGES_DB: "/storage/messages.db"
-    CH_MAIL_UPSTREAM: "smtp"
-    CH_MAIL_UPSTREAM_SIMPLE: "smtp"
-    CH_MAIL_SENDER_NAME_SIMPLE: "containerum"
-    CH_MAIL_SENDER_MAIL_SIMPLE: "noreply-test@containerum.io"
-    CH_MAIL_SENDER_NAME: "containerum"
-    CH_MAIL_SENDER_MAIL: "noreply-test@containerum.io"
-    CH_MAIL_LISTEN_ADDR: ":7070"
-    CH_MAIL_SMTP_ADDR: "mail:465"
-    CH_MAIL_SMTP_LOGIN: "noreply-test@containerum.io"
+    TEMPLATE_DB: "/storage/template.db"
+    MESSAGES_DB: "/storage/messages.db"
+    UPSTREAM: "smtp"
+    UPSTREAM_SIMPLE: "smtp"
+    SENDER_NAME_SIMPLE: "containerum"
+    SENDER_MAIL_SIMPLE: "noreply-test@containerum.io"
+    SENDER_NAME: "containerum"
+    SENDER_MAIL: "noreply-test@containerum.io"
+    LISTEN_ADDR: ":7070"
+    SMTP_ADDR: "mail:465"
+    SMTP_LOGIN: "noreply-test@containerum.io"
   local:
-    CH_MAIL_USER_MANAGER_URL: http://user-manager:8111
-    CH_MAIL_SMTP_PASSWORD: verystrongpassword
-    CH_MAIL_MG_PASSWORD:
+    USER_MANAGER_URL: http://user-manager:8111
+    SMTP_PASSWORD: verystrongpassword
+    MG_PASSWORD: