chore: update smtp values and create smtp folder

Author: xiangyisss

charts/exivity/templates/pigeon/deployment.yaml

@@ -18,7 +18,7 @@ spec:
         {{- include "exivity.labels" $ | indent 8 }}
       annotations:
         checksum/{{- include "exivity.fullname" $ -}}-config-pigeon: {{ include (print $.Template.BasePath "/pigeon/configmap.yaml") . | sha256sum }}
-        checksum/{{- include "exivity.fullname" $ -}}-smtp-secret: {{ include (print $.Template.BasePath "/smtp-secret.yaml") . | sha256sum }}
+        checksum/{{- include "exivity.fullname" $ -}}-smtp-secret: {{ include (print $.Template.BasePath "/smtp/smtp-secret.yaml") . | sha256sum }}
     spec:
       securityContext:
         {{- include "exivity.securityContext" (dict "root" . "component" "pigeon") | indent 8 }}

charts/exivity/templates/proximity/api.deployment.yaml

@@ -23,8 +23,8 @@ spec:
         checksum/{{- include "exivity.fullname" $ -}}-lock: {{ include (print $.Template.BasePath "/proximity/api.configmap.yaml") . | sha256sum }}
         checksum/{{- include "exivity.fullname" $ -}}-proximity-api-env: {{ include (print $.Template.BasePath "/proximity/api.env.yaml") . | sha256sum }}
         checksum/{{- include "exivity.fullname" $ -}}-secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
-        checksum/{{- include "exivity.fullname" $ -}}-config-smtp: {{ include (print $.Template.BasePath "/smtp-configmap.yaml") . | sha256sum }}
-        checksum/{{- include "exivity.fullname" $ -}}-smtp-secret: {{ include (print $.Template.BasePath "/smtp-secret.yaml") . | sha256sum }}
+        checksum/{{- include "exivity.fullname" $ -}}-config-smtp: {{ include (print $.Template.BasePath "/smtp/smtp-configmap.yaml") . | sha256sum }}
+        checksum/{{- include "exivity.fullname" $ -}}-smtp-secret: {{ include (print $.Template.BasePath "/smtp/smtp-secret.yaml") . | sha256sum }}
     spec:
       securityContext:
         {{- include "exivity.securityContext" (dict "root" . "component" "proximityApi") | indent 8 }}
@@ -153,4 +153,4 @@ spec:
         {{ range $key, $val := . }}
         {{ $key }}: {{ $val }}
         {{- end }}
-      {{- end }}
+      {{- end }}

charts/exivity/templates/proximity/cli.deployment.yaml

@@ -73,7 +73,7 @@ spec:
             - configMapRef:
                 name: {{ include "exivity.fullname" $ -}}-proximity-cli-env
             - configMapRef:
-                name: {{ include "exivity.fullname" $ -}}-config-logfile
+                name: {{ include "exivity.fullname" $ -}}-config-logfiles
             - secretRef:
                 name: {{ include "exivity.fullname" $ -}}-app-key
             - secretRef:

charts/exivity/templates/smtp-configmap.yaml

@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "exivity.fullname" $ }}-config-smtp
+  labels:
+    {{- include "exivity.labels" $ | indent 4 }}
+data:
+  EXIVITY_MAIL_DRIVER: {{ .Values.smtp.mail.driver | quote }}
+  EXIVITY_MAIL_HOST: {{ .Values.smtp.mail.host | quote }}
+  EXIVITY_MAIL_PORT: {{ .Values.smtp.mail.port | quote }}
+  EXIVITY_MAIL_FROM_ADDRESS: {{ .Values.smtp.mail.fromAddress | quote }}
+  EXIVITY_MAIL_FROM_NAME: {{ .Values.smtp.mail.fromName | quote }}
+  EXIVITY_MAIL_ENCRYPTION: {{ .Values.smtp.mail.encryption | quote }}
+  EXIVITY_MAIL_SMTP_VERIFY_PEER: {{ .Values.smtp.mail.smtpVerifyPeer | quote }}

charts/exivity/templates/smtp-secret.yaml

@@ -0,0 +1,9 @@
+apiVersion: v1
+kind:       Secret
+metadata:
+  name: {{ include "exivity.fullname" $ -}}-smtp-secret
+  labels:
+    {{- include "exivity.labels" $ | indent 4 }}
+data:
+  EXIVITY_MAIL_USERNAME: {{ .Values.smtp.mail.username | required ".Values.smtp.mail.username is required" | b64enc }}
+  EXIVITY_MAIL_PASSWORD: {{ .Values.smtp.mail.password | required ".Values.smtp.mail.password is required" | b64enc }}

charts/exivity/templates/smtp/smtp-configmap.yaml

@@ -10,7 +10,7 @@
     "secret",
     "ingress",
     "storage",
-    "smtpConfig",
+    "smtp",
     "logfiles",
     "postgresql",
     "rabbitmq",
@@ -184,15 +184,15 @@
         }
       ]
     },
-    "smtpConfig": {
+    "smtp": {
       "type": "object",
       "properties": {
         "mail": {
           "type": "object",
           "properties": {
             "driver": { "type": "string" },
             "host": { "type": "string" },
-            "port": { "type": "integer" },
+            "port": { "type": "string" },
             "encryption": { "type": "string" },
             "smtpVerifyPeer": { "type": "boolean" },
             "fromAddress": { "type": "string" },
@@ -3064,11 +3064,11 @@
         "helmResourcePolicyKeep": true,
         "sharedVolumeAccessMode": "ReadWriteMany"
       },
-      "smtpConfig": {
+      "smtp": {
         "mail": {
           "driver": "",
           "host": "",
-          "port": 0,
+          "port": "",
           "encryption": "",
           "smtpVerifyPeer": false,
           "fromAddress": "",

charts/exivity/templates/smtp/smtp-secret.yaml

@@ -78,17 +78,17 @@ storage:
       import: 1Gi
       report: 1Gi
 
-smtpConfig:
+smtp:
   mail:
     driver: "smtp"           # Mail driver to use (e.g. smtp)
-    host: "smtp.example.com" # SMTP server hostname
-    port: 587                # SMTP server port
-    encryption: "tls"       # Encryption type (tls/ssl/none)
+    host: ""                 # SMTP server hostname
+    port: "1025"              # SMTP server port
+    encryption: ""           # Encryption type (tls/ssl/none)
     smtpVerifyPeer: true     # Verify SMTP peer (true/false), only connect if the server’s certificate is valid and trusted.
-    fromAddress: "[email protected]" # Sender email address
-    fromName: "Exivity"     # Sender name
-    username: "user"        # SMTP username
-    password: "pass"        # SMTP password
+    fromAddress: ""          # Sender email address eg: [email protected]
+    fromName: ""             # Sender name eg: Exivity
+    username: "exivity"      # SMTP username 
+    password: "Exivity123!"  # SMTP password 
 
 logfiles:
     deleteDays: 365          # EXIVITY_LOGFILES_DELETE_DAYS: Delete logfiles after N days