From f0924ad26b5d2dddf237498bfe0386934fe61f45 Mon Sep 17 00:00:00 2001
From: xiangyisss <xiangyisunn@gmail.com>
Date: Mon, 19 May 2025 17:33:06 +0200
Subject: [PATCH 01/15] chore: add proximity options

---
 .../templates/proximity/api.deployment.yaml   |  3 +++
 .../templates/proximity/cli.deployment.yaml   |  3 +++
 .../proximity/proximity-configmap.yaml        | 19 +++++++++++++++++++
 charts/exivity/values.yaml                    | 17 +++++++++++++++++
 4 files changed, 42 insertions(+)
 create mode 100644 charts/exivity/templates/proximity/proximity-configmap.yaml

diff --git a/charts/exivity/templates/proximity/api.deployment.yaml b/charts/exivity/templates/proximity/api.deployment.yaml
index b3a8cdfc..4f0922ff 100644
--- a/charts/exivity/templates/proximity/api.deployment.yaml
+++ b/charts/exivity/templates/proximity/api.deployment.yaml
@@ -23,6 +23,7 @@ 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" $ -}}-proximity-config: {{ include (print $.Template.BasePath "/proximity/proximity-configmap.yaml") . | sha256sum }}
     spec:
       securityContext:
         {{- include "exivity.securityContext" (dict "root" . "component" "proximityApi") | indent 8 }}
@@ -128,6 +129,8 @@ spec:
                 name: {{ include "exivity.fullname" $ -}}-licence-key
             - configMapRef:
                 name: {{ include "exivity.fullname" $ -}}-proximity-api-env
+            - configMapRef:
+                name: {{ include "exivity.fullname" $ -}}-proximity-config
           {{- include "exivity.probes" $ | indent 10}}
       {{- with .Values.service.pullSecrets }}
       imagePullSecrets:
diff --git a/charts/exivity/templates/proximity/cli.deployment.yaml b/charts/exivity/templates/proximity/cli.deployment.yaml
index 646672f2..607b58c9 100644
--- a/charts/exivity/templates/proximity/cli.deployment.yaml
+++ b/charts/exivity/templates/proximity/cli.deployment.yaml
@@ -20,6 +20,7 @@ spec:
         checksum/{{- include "exivity.fullname" $ -}}-config-proximity-cli: {{ include (print $.Template.BasePath "/proximity/cli.configmap.yaml") . | sha256sum }}
         checksum/{{- include "exivity.fullname" $ -}}-proximity-cli-env: {{ include (print $.Template.BasePath "/proximity/cli.env.yaml") . | sha256sum }}
         checksum/{{- include "exivity.fullname" $ -}}-secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
+        checksum/{{- include "exivity.fullname" $ -}}-proximity-config: {{ include (print $.Template.BasePath "/proximity/proximity-configmap.yaml") . | sha256sum }}
     spec:
       securityContext:
         {{- include "exivity.securityContext" (dict "root" . "component" "proximityCli") | indent 8 }}
@@ -75,6 +76,8 @@ spec:
                 name: {{ include "exivity.fullname" $ -}}-app-key
             - secretRef:
                 name: {{ include "exivity.fullname" $ -}}-jwt-secret
+            - configMapRef:
+                name: {{ include "exivity.fullname" $ -}}-proximity-config
           {{- include "exivity.probes" $ | indent 10}}
       {{- with .Values.service.pullSecrets }}
       imagePullSecrets:
diff --git a/charts/exivity/templates/proximity/proximity-configmap.yaml b/charts/exivity/templates/proximity/proximity-configmap.yaml
new file mode 100644
index 00000000..f6387c73
--- /dev/null
+++ b/charts/exivity/templates/proximity/proximity-configmap.yaml
@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "exivity.fullname" $ }}-proximity-config
+  labels:
+    app.kubernetes.io/component: proximity
+    {{- include "exivity.labels" $ | indent 4 }}
+data:
+  EXIVITY_MAIL_DRIVER: "{{ .Values.proximity.mail.driver }}"
+  EXIVITY_MAIL_HOST: "{{ .Values.proximity.mail.host }}"
+  EXIVITY_MAIL_PORT: "{{ .Values.proximity.mail.port }}"
+  EXIVITY_MAIL_FROM_ADDRESS: "{{ .Values.proximity.mail.fromAddress }}"
+  EXIVITY_MAIL_FROM_NAME: "{{ .Values.proximity.mail.fromName }}"
+  EXIVITY_MAIL_ENCRYPTION: "{{ .Values.proximity.mail.encryption }}"
+  EXIVITY_MAIL_SMTP_VERIFY_PEER: "{{ .Values.proximity.mail.smtpVerifyPeer }}"
+  EXIVITY_MAIL_USERNAME: "{{ .Values.proximity.mail.username }}"
+  EXIVITY_MAIL_PASSWORD: "{{ .Values.proximity.mail.password }}"
+  EXIVITY_LOGFILES_DELETE_DAYS: "{{ .Values.proximity.logfiles.deleteDays }}"
+  EXIVITY_LOGFILES_COMPRESS_DAYS: "{{ .Values.proximity.logfiles.compressDays }}"
diff --git a/charts/exivity/values.yaml b/charts/exivity/values.yaml
index 8af56a26..d891faa5 100644
--- a/charts/exivity/values.yaml
+++ b/charts/exivity/values.yaml
@@ -402,6 +402,23 @@ service:
       #   [Your Intermediate CA certificate here]
       #   -----END CERTIFICATE-----
 
+proximity:
+  # Mail configuration for Proximity. Set these values to enable outbound email notifications.
+  # Example for a typical SMTP server:
+  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)
+    smtpVerifyPeer: true     # Verify SMTP peer (true/false), only connect if the server’s certificate is valid and trusted.
+    fromAddress: "noreply@example.com" # Sender email address
+    fromName: "Exivity"     # Sender name
+    username: "user"        # SMTP username
+    password: "pass"        # SMTP password
+  logfiles:
+    deleteDays: 365          # EXIVITY_LOGFILES_DELETE_DAYS: Delete logfiles after N days
+    compressDays: 30         # EXIVITY_LOGFILES_COMPRESS_DAYS: Compress logfiles after N days
+
 # Default log level for backend services. Accepts 'debug', 'info'.
 # Use 'debug' for development environments and 'info' or higher for production to reduce log verbosity.
 logLevel:

From 50d15ba8f7737e4b76bc2afcf761bb8964da3263 Mon Sep 17 00:00:00 2001
From: xiangyisss <xiangyisunn@gmail.com>
Date: Wed, 21 May 2025 13:02:59 +0200
Subject: [PATCH 02/15] chore: add smtp and logfiles cofigurations

---
 .../exivity/templates/pigeon/deployment.yaml  |  3 ++
 .../templates/proximity/api.deployment.yaml   |  7 ++-
 .../templates/proximity/cli.deployment.yaml   |  6 +--
 .../proximity/logfile.configmap.yaml          |  9 ++++
 .../proximity/proximity-configmap.yaml        | 19 -------
 charts/exivity/templates/smtp-configmap.yaml  | 14 ++++++
 charts/exivity/templates/smtp-secret.yaml     |  9 ++++
 charts/exivity/values.schema.json             | 49 +++++++++++++++++++
 charts/exivity/values.yaml                    | 33 ++++++-------
 9 files changed, 108 insertions(+), 41 deletions(-)
 create mode 100644 charts/exivity/templates/proximity/logfile.configmap.yaml
 delete mode 100644 charts/exivity/templates/proximity/proximity-configmap.yaml
 create mode 100644 charts/exivity/templates/smtp-configmap.yaml
 create mode 100644 charts/exivity/templates/smtp-secret.yaml

diff --git a/charts/exivity/templates/pigeon/deployment.yaml b/charts/exivity/templates/pigeon/deployment.yaml
index a967013f..1ea3d0d6 100644
--- a/charts/exivity/templates/pigeon/deployment.yaml
+++ b/charts/exivity/templates/pigeon/deployment.yaml
@@ -18,6 +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 }}
     spec:
       securityContext:
         {{- include "exivity.securityContext" (dict "root" . "component" "pigeon") | indent 8 }}
@@ -59,6 +60,8 @@ spec:
           envFrom:
             - secretRef:
                 name: {{ include "exivity.fullname" $ -}}-app-key
+            - secretRef:
+                name: {{ include "exivity.fullname" $ -}}-smtp-secret
           env:
             - name:  REDIS_HOST
               value: exivity-redis-master
diff --git a/charts/exivity/templates/proximity/api.deployment.yaml b/charts/exivity/templates/proximity/api.deployment.yaml
index 4f0922ff..58987265 100644
--- a/charts/exivity/templates/proximity/api.deployment.yaml
+++ b/charts/exivity/templates/proximity/api.deployment.yaml
@@ -23,7 +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" $ -}}-proximity-config: {{ include (print $.Template.BasePath "/proximity/proximity-configmap.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 }}
     spec:
       securityContext:
         {{- include "exivity.securityContext" (dict "root" . "component" "proximityApi") | indent 8 }}
@@ -127,10 +128,12 @@ spec:
                 name: {{ include "exivity.fullname" $ -}}-jwt-secret
             - secretRef:
                 name: {{ include "exivity.fullname" $ -}}-licence-key
+            - secretRef:
+                name: {{ include "exivity.fullname" $ -}}-smtp-secret
             - configMapRef:
                 name: {{ include "exivity.fullname" $ -}}-proximity-api-env
             - configMapRef:
-                name: {{ include "exivity.fullname" $ -}}-proximity-config
+                name: {{ include "exivity.fullname" $ -}}-config-smtp
           {{- include "exivity.probes" $ | indent 10}}
       {{- with .Values.service.pullSecrets }}
       imagePullSecrets:
diff --git a/charts/exivity/templates/proximity/cli.deployment.yaml b/charts/exivity/templates/proximity/cli.deployment.yaml
index 607b58c9..b24438af 100644
--- a/charts/exivity/templates/proximity/cli.deployment.yaml
+++ b/charts/exivity/templates/proximity/cli.deployment.yaml
@@ -20,7 +20,7 @@ spec:
         checksum/{{- include "exivity.fullname" $ -}}-config-proximity-cli: {{ include (print $.Template.BasePath "/proximity/cli.configmap.yaml") . | sha256sum }}
         checksum/{{- include "exivity.fullname" $ -}}-proximity-cli-env: {{ include (print $.Template.BasePath "/proximity/cli.env.yaml") . | sha256sum }}
         checksum/{{- include "exivity.fullname" $ -}}-secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
-        checksum/{{- include "exivity.fullname" $ -}}-proximity-config: {{ include (print $.Template.BasePath "/proximity/proximity-configmap.yaml") . | sha256sum }}
+        checksum/{{- include "exivity.fullname" $ -}}-config-logfiles: {{ include (print $.Template.BasePath "/proximity/logfile.configmap.yaml") . | sha256sum }}
     spec:
       securityContext:
         {{- include "exivity.securityContext" (dict "root" . "component" "proximityCli") | indent 8 }}
@@ -72,12 +72,12 @@ spec:
           envFrom:
             - configMapRef:
                 name: {{ include "exivity.fullname" $ -}}-proximity-cli-env
+            - configMapRef:
+                name: {{ include "exivity.fullname" $ -}}-config-logfile
             - secretRef:
                 name: {{ include "exivity.fullname" $ -}}-app-key
             - secretRef:
                 name: {{ include "exivity.fullname" $ -}}-jwt-secret
-            - configMapRef:
-                name: {{ include "exivity.fullname" $ -}}-proximity-config
           {{- include "exivity.probes" $ | indent 10}}
       {{- with .Values.service.pullSecrets }}
       imagePullSecrets:
diff --git a/charts/exivity/templates/proximity/logfile.configmap.yaml b/charts/exivity/templates/proximity/logfile.configmap.yaml
new file mode 100644
index 00000000..0696a6c6
--- /dev/null
+++ b/charts/exivity/templates/proximity/logfile.configmap.yaml
@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "exivity.fullname" $ }}-config-logfiles
+  labels:
+    {{- include "exivity.labels" $ | indent 4 }}
+data:
+  EXIVITY_LOGFILES_DELETE_DAYS: "{{ .Values.logfiles.deleteDays }}"
+  EXIVITY_LOGFILES_COMPRESS_DAYS: "{{ .Values.logfiles.compressDays }}"
diff --git a/charts/exivity/templates/proximity/proximity-configmap.yaml b/charts/exivity/templates/proximity/proximity-configmap.yaml
deleted file mode 100644
index f6387c73..00000000
--- a/charts/exivity/templates/proximity/proximity-configmap.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "exivity.fullname" $ }}-proximity-config
-  labels:
-    app.kubernetes.io/component: proximity
-    {{- include "exivity.labels" $ | indent 4 }}
-data:
-  EXIVITY_MAIL_DRIVER: "{{ .Values.proximity.mail.driver }}"
-  EXIVITY_MAIL_HOST: "{{ .Values.proximity.mail.host }}"
-  EXIVITY_MAIL_PORT: "{{ .Values.proximity.mail.port }}"
-  EXIVITY_MAIL_FROM_ADDRESS: "{{ .Values.proximity.mail.fromAddress }}"
-  EXIVITY_MAIL_FROM_NAME: "{{ .Values.proximity.mail.fromName }}"
-  EXIVITY_MAIL_ENCRYPTION: "{{ .Values.proximity.mail.encryption }}"
-  EXIVITY_MAIL_SMTP_VERIFY_PEER: "{{ .Values.proximity.mail.smtpVerifyPeer }}"
-  EXIVITY_MAIL_USERNAME: "{{ .Values.proximity.mail.username }}"
-  EXIVITY_MAIL_PASSWORD: "{{ .Values.proximity.mail.password }}"
-  EXIVITY_LOGFILES_DELETE_DAYS: "{{ .Values.proximity.logfiles.deleteDays }}"
-  EXIVITY_LOGFILES_COMPRESS_DAYS: "{{ .Values.proximity.logfiles.compressDays }}"
diff --git a/charts/exivity/templates/smtp-configmap.yaml b/charts/exivity/templates/smtp-configmap.yaml
new file mode 100644
index 00000000..8242842f
--- /dev/null
+++ b/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.smtpConfig.mail.driver | default "" }}"
+  EXIVITY_MAIL_HOST: "{{ .Values.smtpConfig.mail.host | default "" }}"
+  EXIVITY_MAIL_PORT: "{{ .Values.smtpConfig.mail.port | default "" }}"
+  EXIVITY_MAIL_FROM_ADDRESS: "{{ .Values.smtpConfig.mail.fromAddress | default "" }}"
+  EXIVITY_MAIL_FROM_NAME: "{{ .Values.smtpConfig.mail.fromName | default "" }}"
+  EXIVITY_MAIL_ENCRYPTION: "{{ .Values.smtpConfig.mail.encryption | default "" }}"
+  EXIVITY_MAIL_SMTP_VERIFY_PEER: "{{ .Values.smtpConfig.mail.smtpVerifyPeer | default "" }}"
diff --git a/charts/exivity/templates/smtp-secret.yaml b/charts/exivity/templates/smtp-secret.yaml
new file mode 100644
index 00000000..6864afd3
--- /dev/null
+++ b/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.smtpConfig.mail.username }}"
+  EXIVITY_MAIL_PASSWORD: "{{ .Values.smtpConfig.mail.password }}"
diff --git a/charts/exivity/values.schema.json b/charts/exivity/values.schema.json
index 6e741035..03e1bd18 100644
--- a/charts/exivity/values.schema.json
+++ b/charts/exivity/values.schema.json
@@ -10,6 +10,8 @@
     "secret",
     "ingress",
     "storage",
+    "smtpConfig",
+    "logfiles",
     "postgresql",
     "rabbitmq",
     "service",
@@ -182,6 +184,35 @@
         }
       ]
     },
+    "smtpConfig": {
+      "type": "object",
+      "properties": {
+        "mail": {
+          "type": "object",
+          "properties": {
+            "driver": { "type": "string" },
+            "host": { "type": "string" },
+            "port": { "type": "integer" },
+            "encryption": { "type": "string" },
+            "smtpVerifyPeer": { "type": "boolean" },
+            "fromAddress": { "type": "string" },
+            "fromName": { "type": "string" },
+            "username": { "type": "string" },
+            "password": { "type": "string" }
+          },
+          "required": ["driver", "host", "port", "encryption", "smtpVerifyPeer", "fromAddress", "fromName", "username", "password"]
+        }
+      },
+      "required": ["mail"]
+    },
+    "logfiles": {
+      "type": "object",
+      "properties": {
+        "deleteDays": { "type": "integer" },
+        "compressDays": { "type": "integer" }
+      },
+      "required": ["deleteDays", "compressDays"]
+    },
     "postgresql": {
       "type": "object",
       "default": {},
@@ -2775,6 +2806,7 @@
         }
       ]
     },
+   
     "logLevel": {
       "type": "object",
       "default": {},
@@ -2993,6 +3025,23 @@
         "helmResourcePolicyKeep": true,
         "sharedVolumeAccessMode": "ReadWriteMany"
       },
+      "smtpConfig": {
+        "mail": {
+          "driver": "",
+          "host": "",
+          "port": 0,
+          "encryption": "",
+          "smtpVerifyPeer": false,
+          "fromAddress": "",
+          "fromName": "",
+          "username": "",
+          "password": ""
+        }
+      },
+      "logfiles": {
+        "deleteDays": 0,
+        "compressDays": 0
+      },
       "postgresql": {
         "enabled": true,
         "global": {
diff --git a/charts/exivity/values.yaml b/charts/exivity/values.yaml
index d891faa5..3ba491f7 100644
--- a/charts/exivity/values.yaml
+++ b/charts/exivity/values.yaml
@@ -39,6 +39,22 @@ storage:
   helmResourcePolicyKeep: true # Ensures that storage resources are retained after a Helm release is deleted.
   sharedVolumeAccessMode: ReadWriteMany # Defines the access mode for shared volumes; 'ReadWriteMany' allows multiple nodes to read/write simultaneously.
 
+smtpConfig:
+  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)
+    smtpVerifyPeer: true     # Verify SMTP peer (true/false), only connect if the server’s certificate is valid and trusted.
+    fromAddress: "noreply@example.com" # Sender email address
+    fromName: "Exivity"     # Sender name
+    username: "user"        # SMTP username
+    password: "pass"        # SMTP password
+
+logfiles:
+    deleteDays: 365          # EXIVITY_LOGFILES_DELETE_DAYS: Delete logfiles after N days
+    compressDays: 30         # EXIVITY_LOGFILES_COMPRESS_DAYS: Compress logfiles after N days
+
 # Configuration for PostgreSQL, either as an embedded database using the Bitnami PostgreSQL chart or an external database.
 # It is recommended to use an external PostgreSQL server for production environments to ensure scalability and manageability.
 # The embedded PostgreSQL chart is primarily intended for testing and non-production purposes.
@@ -402,23 +418,6 @@ service:
       #   [Your Intermediate CA certificate here]
       #   -----END CERTIFICATE-----
 
-proximity:
-  # Mail configuration for Proximity. Set these values to enable outbound email notifications.
-  # Example for a typical SMTP server:
-  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)
-    smtpVerifyPeer: true     # Verify SMTP peer (true/false), only connect if the server’s certificate is valid and trusted.
-    fromAddress: "noreply@example.com" # Sender email address
-    fromName: "Exivity"     # Sender name
-    username: "user"        # SMTP username
-    password: "pass"        # SMTP password
-  logfiles:
-    deleteDays: 365          # EXIVITY_LOGFILES_DELETE_DAYS: Delete logfiles after N days
-    compressDays: 30         # EXIVITY_LOGFILES_COMPRESS_DAYS: Compress logfiles after N days
-
 # Default log level for backend services. Accepts 'debug', 'info'.
 # Use 'debug' for development environments and 'info' or higher for production to reduce log verbosity.
 logLevel:

From 547e56eb83b47613e4065597d3e9aee5b25f1699 Mon Sep 17 00:00:00 2001
From: xiangyisss <xiangyisunn@gmail.com>
Date: Wed, 21 May 2025 16:50:17 +0200
Subject: [PATCH 03/15] chore: update smtp values and create smtp folder

---
 charts/exivity/templates/pigeon/deployment.yaml  |  2 +-
 .../templates/proximity/api.deployment.yaml      |  6 +++---
 .../templates/proximity/cli.deployment.yaml      |  2 +-
 charts/exivity/templates/smtp-configmap.yaml     | 14 --------------
 charts/exivity/templates/smtp-secret.yaml        |  9 ---------
 .../exivity/templates/smtp/smtp-configmap.yaml   | 14 ++++++++++++++
 charts/exivity/templates/smtp/smtp-secret.yaml   |  9 +++++++++
 charts/exivity/values.schema.json                | 10 +++++-----
 charts/exivity/values.yaml                       | 16 ++++++++--------
 9 files changed, 41 insertions(+), 41 deletions(-)
 delete mode 100644 charts/exivity/templates/smtp-configmap.yaml
 delete mode 100644 charts/exivity/templates/smtp-secret.yaml
 create mode 100644 charts/exivity/templates/smtp/smtp-configmap.yaml
 create mode 100644 charts/exivity/templates/smtp/smtp-secret.yaml

diff --git a/charts/exivity/templates/pigeon/deployment.yaml b/charts/exivity/templates/pigeon/deployment.yaml
index 1ea3d0d6..d85dc7ae 100644
--- a/charts/exivity/templates/pigeon/deployment.yaml
+++ b/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 }}
diff --git a/charts/exivity/templates/proximity/api.deployment.yaml b/charts/exivity/templates/proximity/api.deployment.yaml
index 866f20e3..a784495f 100644
--- a/charts/exivity/templates/proximity/api.deployment.yaml
+++ b/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 }}
\ No newline at end of file
+      {{- end }}
diff --git a/charts/exivity/templates/proximity/cli.deployment.yaml b/charts/exivity/templates/proximity/cli.deployment.yaml
index b24438af..fb7a0255 100644
--- a/charts/exivity/templates/proximity/cli.deployment.yaml
+++ b/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:
diff --git a/charts/exivity/templates/smtp-configmap.yaml b/charts/exivity/templates/smtp-configmap.yaml
deleted file mode 100644
index 8242842f..00000000
--- a/charts/exivity/templates/smtp-configmap.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "exivity.fullname" $ }}-config-smtp
-  labels:
-    {{- include "exivity.labels" $ | indent 4 }}
-data:
-  EXIVITY_MAIL_DRIVER: "{{ .Values.smtpConfig.mail.driver | default "" }}"
-  EXIVITY_MAIL_HOST: "{{ .Values.smtpConfig.mail.host | default "" }}"
-  EXIVITY_MAIL_PORT: "{{ .Values.smtpConfig.mail.port | default "" }}"
-  EXIVITY_MAIL_FROM_ADDRESS: "{{ .Values.smtpConfig.mail.fromAddress | default "" }}"
-  EXIVITY_MAIL_FROM_NAME: "{{ .Values.smtpConfig.mail.fromName | default "" }}"
-  EXIVITY_MAIL_ENCRYPTION: "{{ .Values.smtpConfig.mail.encryption | default "" }}"
-  EXIVITY_MAIL_SMTP_VERIFY_PEER: "{{ .Values.smtpConfig.mail.smtpVerifyPeer | default "" }}"
diff --git a/charts/exivity/templates/smtp-secret.yaml b/charts/exivity/templates/smtp-secret.yaml
deleted file mode 100644
index 6864afd3..00000000
--- a/charts/exivity/templates/smtp-secret.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-apiVersion: v1
-kind:       Secret
-metadata:
-  name: {{ include "exivity.fullname" $ -}}-smtp-secret
-  labels:
-    {{- include "exivity.labels" $ | indent 4 }}
-data:
-  EXIVITY_MAIL_USERNAME: "{{ .Values.smtpConfig.mail.username }}"
-  EXIVITY_MAIL_PASSWORD: "{{ .Values.smtpConfig.mail.password }}"
diff --git a/charts/exivity/templates/smtp/smtp-configmap.yaml b/charts/exivity/templates/smtp/smtp-configmap.yaml
new file mode 100644
index 00000000..a15f4236
--- /dev/null
+++ b/charts/exivity/templates/smtp/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 }}
diff --git a/charts/exivity/templates/smtp/smtp-secret.yaml b/charts/exivity/templates/smtp/smtp-secret.yaml
new file mode 100644
index 00000000..31c207fd
--- /dev/null
+++ b/charts/exivity/templates/smtp/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 }}
diff --git a/charts/exivity/values.schema.json b/charts/exivity/values.schema.json
index b00f7c8c..48ae16d4 100644
--- a/charts/exivity/values.schema.json
+++ b/charts/exivity/values.schema.json
@@ -10,7 +10,7 @@
     "secret",
     "ingress",
     "storage",
-    "smtpConfig",
+    "smtp",
     "logfiles",
     "postgresql",
     "rabbitmq",
@@ -184,7 +184,7 @@
         }
       ]
     },
-    "smtpConfig": {
+    "smtp": {
       "type": "object",
       "properties": {
         "mail": {
@@ -192,7 +192,7 @@
           "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": "",
diff --git a/charts/exivity/values.yaml b/charts/exivity/values.yaml
index 91fad70c..f636b950 100644
--- a/charts/exivity/values.yaml
+++ b/charts/exivity/values.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: "noreply@example.com" # Sender email address
-    fromName: "Exivity"     # Sender name
-    username: "user"        # SMTP username
-    password: "pass"        # SMTP password
+    fromAddress: ""          # Sender email address eg: noreply@exivity.com
+    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

From 1088eaf5c782614869611e5ee453aeed49ddeb0a Mon Sep 17 00:00:00 2001
From: xiangyisss <xiangyisunn@gmail.com>
Date: Thu, 22 May 2025 13:37:03 +0200
Subject: [PATCH 04/15] chore: update logfiles keys in configmap and adjust
 smtp secret

---
 charts/exivity/templates/proximity/logfile.configmap.yaml | 4 ++--
 charts/exivity/templates/smtp/smtp-secret.yaml            | 6 ++++++
 charts/exivity/values.yaml                                | 4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/charts/exivity/templates/proximity/logfile.configmap.yaml b/charts/exivity/templates/proximity/logfile.configmap.yaml
index 0696a6c6..1a0c9cd1 100644
--- a/charts/exivity/templates/proximity/logfile.configmap.yaml
+++ b/charts/exivity/templates/proximity/logfile.configmap.yaml
@@ -5,5 +5,5 @@ metadata:
   labels:
     {{- include "exivity.labels" $ | indent 4 }}
 data:
-  EXIVITY_LOGFILES_DELETE_DAYS: "{{ .Values.logfiles.deleteDays }}"
-  EXIVITY_LOGFILES_COMPRESS_DAYS: "{{ .Values.logfiles.compressDays }}"
+  LOGFILES_DELETE_DAYS: "{{ .Values.logfiles.deleteDays }}"
+  LOGFILES_COMPRESS_DAYS: "{{ .Values.logfiles.compressDays }}"
diff --git a/charts/exivity/templates/smtp/smtp-secret.yaml b/charts/exivity/templates/smtp/smtp-secret.yaml
index 31c207fd..3b375458 100644
--- a/charts/exivity/templates/smtp/smtp-secret.yaml
+++ b/charts/exivity/templates/smtp/smtp-secret.yaml
@@ -5,5 +5,11 @@ metadata:
   labels:
     {{- include "exivity.labels" $ | indent 4 }}
 data:
+  {{- $existingSecret := lookup "v1" "Secret" $.Release.Namespace (printf "%s-smtp-secret" (include "exivity.fullname" $)) }}
+  {{- if and $.Release.IsUpgrade $existingSecret }}
+  EXIVITY_MAIL_USERNAME: {{ index $existingSecret.data "EXIVITY_MAIL_USERNAME" }}
+  EXIVITY_MAIL_PASSWORD: {{ index $existingSecret.data "EXIVITY_MAIL_PASSWORD" }}
+  {{- else }}
   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 }}
+  {{- end }}
diff --git a/charts/exivity/values.yaml b/charts/exivity/values.yaml
index f636b950..5f79be62 100644
--- a/charts/exivity/values.yaml
+++ b/charts/exivity/values.yaml
@@ -91,8 +91,8 @@ smtp:
     password: "Exivity123!"  # SMTP password 
 
 logfiles:
-    deleteDays: 365          # EXIVITY_LOGFILES_DELETE_DAYS: Delete logfiles after N days
-    compressDays: 30         # EXIVITY_LOGFILES_COMPRESS_DAYS: Compress logfiles after N days
+  deleteDays: 365          # Delete logfiles after N days
+  compressDays: 30         # Compress logfiles after N days
 
 # Configuration for PostgreSQL, either as an embedded database using the Bitnami PostgreSQL chart or an external database.
 # It is recommended to use an external PostgreSQL server for production environments to ensure scalability and manageability.

From 5fdbf8434f7db3fca251661698e7e97645abbe73 Mon Sep 17 00:00:00 2001
From: xiangyisss <xiangyisunn@gmail.com>
Date: Wed, 28 May 2025 09:12:58 +0200
Subject: [PATCH 05/15] chore: set default value for smtp

---
 charts/exivity/templates/pigeon/deployment.yaml           | 2 ++
 charts/exivity/templates/proximity/api.deployment.yaml    | 2 ++
 charts/exivity/templates/proximity/cli.deployment.yaml    | 2 +-
 .../{logfile.configmap.yaml => logfiles.configmap.yaml}   | 4 ++--
 charts/exivity/values.yaml                                | 8 ++++----
 5 files changed, 11 insertions(+), 7 deletions(-)
 rename charts/exivity/templates/proximity/{logfile.configmap.yaml => logfiles.configmap.yaml} (54%)

diff --git a/charts/exivity/templates/pigeon/deployment.yaml b/charts/exivity/templates/pigeon/deployment.yaml
index d85dc7ae..91771853 100644
--- a/charts/exivity/templates/pigeon/deployment.yaml
+++ b/charts/exivity/templates/pigeon/deployment.yaml
@@ -62,6 +62,8 @@ spec:
                 name: {{ include "exivity.fullname" $ -}}-app-key
             - secretRef:
                 name: {{ include "exivity.fullname" $ -}}-smtp-secret
+            - configMapRef:
+                name: {{ include "exivity.fullname" $ -}}-config-smtp
           env:
             - name:  REDIS_HOST
               value: exivity-redis-master
diff --git a/charts/exivity/templates/proximity/api.deployment.yaml b/charts/exivity/templates/proximity/api.deployment.yaml
index a784495f..64132c42 100644
--- a/charts/exivity/templates/proximity/api.deployment.yaml
+++ b/charts/exivity/templates/proximity/api.deployment.yaml
@@ -38,6 +38,8 @@ spec:
                   name: {{ include "exivity.fullname" $ -}}-licence-pub
               - secret:
                   name: {{ include "exivity.fullname" $ -}}-licence-key
+              - configMap:
+                  name: {{ include "exivity.fullname" $ -}}-config-smtp
         - name: exivity-lock
           configMap:
             name: {{ include "exivity.fullname" $ -}}-lock
diff --git a/charts/exivity/templates/proximity/cli.deployment.yaml b/charts/exivity/templates/proximity/cli.deployment.yaml
index fb7a0255..2c375ea2 100644
--- a/charts/exivity/templates/proximity/cli.deployment.yaml
+++ b/charts/exivity/templates/proximity/cli.deployment.yaml
@@ -20,7 +20,7 @@ spec:
         checksum/{{- include "exivity.fullname" $ -}}-config-proximity-cli: {{ include (print $.Template.BasePath "/proximity/cli.configmap.yaml") . | sha256sum }}
         checksum/{{- include "exivity.fullname" $ -}}-proximity-cli-env: {{ include (print $.Template.BasePath "/proximity/cli.env.yaml") . | sha256sum }}
         checksum/{{- include "exivity.fullname" $ -}}-secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
-        checksum/{{- include "exivity.fullname" $ -}}-config-logfiles: {{ include (print $.Template.BasePath "/proximity/logfile.configmap.yaml") . | sha256sum }}
+        checksum/{{- include "exivity.fullname" $ -}}-config-logfiles: {{ include (print $.Template.BasePath "/proximity/logfiles.configmap.yaml") . | sha256sum }}
     spec:
       securityContext:
         {{- include "exivity.securityContext" (dict "root" . "component" "proximityCli") | indent 8 }}
diff --git a/charts/exivity/templates/proximity/logfile.configmap.yaml b/charts/exivity/templates/proximity/logfiles.configmap.yaml
similarity index 54%
rename from charts/exivity/templates/proximity/logfile.configmap.yaml
rename to charts/exivity/templates/proximity/logfiles.configmap.yaml
index 1a0c9cd1..0696a6c6 100644
--- a/charts/exivity/templates/proximity/logfile.configmap.yaml
+++ b/charts/exivity/templates/proximity/logfiles.configmap.yaml
@@ -5,5 +5,5 @@ metadata:
   labels:
     {{- include "exivity.labels" $ | indent 4 }}
 data:
-  LOGFILES_DELETE_DAYS: "{{ .Values.logfiles.deleteDays }}"
-  LOGFILES_COMPRESS_DAYS: "{{ .Values.logfiles.compressDays }}"
+  EXIVITY_LOGFILES_DELETE_DAYS: "{{ .Values.logfiles.deleteDays }}"
+  EXIVITY_LOGFILES_COMPRESS_DAYS: "{{ .Values.logfiles.compressDays }}"
diff --git a/charts/exivity/values.yaml b/charts/exivity/values.yaml
index 5f79be62..c3a4d972 100644
--- a/charts/exivity/values.yaml
+++ b/charts/exivity/values.yaml
@@ -81,12 +81,12 @@ storage:
 smtp:
   mail:
     driver: "smtp"           # Mail driver to use (e.g. smtp)
-    host: ""                 # SMTP server hostname
+    host: "exivity"                 # SMTP server hostname
     port: "1025"              # SMTP server port
-    encryption: ""           # Encryption type (tls/ssl/none)
+    encryption: "ssl"           # Encryption type (tls/ssl/none)
     smtpVerifyPeer: true     # Verify SMTP peer (true/false), only connect if the server’s certificate is valid and trusted.
-    fromAddress: ""          # Sender email address eg: noreply@exivity.com
-    fromName: ""             # Sender name eg: Exivity
+    fromAddress: "noreply@exivity.com"          # Sender email address eg: noreply@exivity.com
+    fromName: "Exivity"             # Sender name eg: Exivity
     username: "exivity"      # SMTP username 
     password: "Exivity123!"  # SMTP password 
 

From 7396d29e7012cdfb7f2e0137031b035b9e47eeac Mon Sep 17 00:00:00 2001
From: Steffen Exler <linuxluigi@users.noreply.github.com>
Date: Wed, 28 May 2025 11:39:54 +0200
Subject: [PATCH 06/15] chore: enhance SMTP configuration by adding missing
 fields and updating deployment references

Signed-off-by: Steffen Exler <linuxluigi@users.noreply.github.com>
---
 .../exivity/templates/pigeon/deployment.yaml  |  3 +++
 .../templates/proximity/api.deployment.yaml   |  4 ++--
 .../templates/smtp/smtp-configmap.yaml        | 14 ++++++++++++
 .../exivity/templates/smtp/smtp-secret.yaml   | 14 +++++-------
 charts/exivity/values.schema.json             | 11 ++++------
 charts/exivity/values.yaml                    | 22 +++++++++----------
 6 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/charts/exivity/templates/pigeon/deployment.yaml b/charts/exivity/templates/pigeon/deployment.yaml
index d85dc7ae..10083a64 100644
--- a/charts/exivity/templates/pigeon/deployment.yaml
+++ b/charts/exivity/templates/pigeon/deployment.yaml
@@ -18,6 +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" $ -}}-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:
@@ -62,6 +63,8 @@ spec:
                 name: {{ include "exivity.fullname" $ -}}-app-key
             - secretRef:
                 name: {{ include "exivity.fullname" $ -}}-smtp-secret
+            - configMapRef:
+                name: {{ include "exivity.fullname" $ -}}-config-smtp
           env:
             - name:  REDIS_HOST
               value: exivity-redis-master
diff --git a/charts/exivity/templates/proximity/api.deployment.yaml b/charts/exivity/templates/proximity/api.deployment.yaml
index a784495f..7af6f665 100644
--- a/charts/exivity/templates/proximity/api.deployment.yaml
+++ b/charts/exivity/templates/proximity/api.deployment.yaml
@@ -132,10 +132,10 @@ spec:
                 name: {{ include "exivity.fullname" $ -}}-app-key
             - secretRef:
                 name: {{ include "exivity.fullname" $ -}}-jwt-secret
-            - secretRef:
-                name: {{ include "exivity.fullname" $ -}}-smtp-secret
             - configMapRef:
                 name: {{ include "exivity.fullname" $ -}}-proximity-api-env
+            - secretRef:
+                name: {{ include "exivity.fullname" $ -}}-smtp-secret
             - configMapRef:
                 name: {{ include "exivity.fullname" $ -}}-config-smtp
           {{- include "exivity.probes" $ | indent 10}}
diff --git a/charts/exivity/templates/smtp/smtp-configmap.yaml b/charts/exivity/templates/smtp/smtp-configmap.yaml
index a15f4236..058fae4a 100644
--- a/charts/exivity/templates/smtp/smtp-configmap.yaml
+++ b/charts/exivity/templates/smtp/smtp-configmap.yaml
@@ -5,10 +5,24 @@ metadata:
   labels:
     {{- include "exivity.labels" $ | indent 4 }}
 data:
+  {{- if .Values.smtp.mail.driver }}
   EXIVITY_MAIL_DRIVER: {{ .Values.smtp.mail.driver | quote }}
+  {{- end }}
+  {{- if .Values.smtp.mail.host }}
   EXIVITY_MAIL_HOST: {{ .Values.smtp.mail.host | quote }}
+  {{- end }}
+  {{- if .Values.smtp.mail.port }}
   EXIVITY_MAIL_PORT: {{ .Values.smtp.mail.port | quote }}
+  {{- end }}
+  {{- if .Values.smtp.mail.fromAddress }}
   EXIVITY_MAIL_FROM_ADDRESS: {{ .Values.smtp.mail.fromAddress | quote }}
+  {{- end }}
+  {{- if .Values.smtp.mail.fromName }}
   EXIVITY_MAIL_FROM_NAME: {{ .Values.smtp.mail.fromName | quote }}
+  {{- end }}
+  {{- if .Values.smtp.mail.encryption }}
   EXIVITY_MAIL_ENCRYPTION: {{ .Values.smtp.mail.encryption | quote }}
+  {{- end }}
+  {{- if .Values.smtp.mail.smtpVerifyPeer }}
   EXIVITY_MAIL_SMTP_VERIFY_PEER: {{ .Values.smtp.mail.smtpVerifyPeer | quote }}
+  {{- end }}
diff --git a/charts/exivity/templates/smtp/smtp-secret.yaml b/charts/exivity/templates/smtp/smtp-secret.yaml
index 3b375458..d4cbb113 100644
--- a/charts/exivity/templates/smtp/smtp-secret.yaml
+++ b/charts/exivity/templates/smtp/smtp-secret.yaml
@@ -5,11 +5,9 @@ metadata:
   labels:
     {{- include "exivity.labels" $ | indent 4 }}
 data:
-  {{- $existingSecret := lookup "v1" "Secret" $.Release.Namespace (printf "%s-smtp-secret" (include "exivity.fullname" $)) }}
-  {{- if and $.Release.IsUpgrade $existingSecret }}
-  EXIVITY_MAIL_USERNAME: {{ index $existingSecret.data "EXIVITY_MAIL_USERNAME" }}
-  EXIVITY_MAIL_PASSWORD: {{ index $existingSecret.data "EXIVITY_MAIL_PASSWORD" }}
-  {{- else }}
-  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 }}
-  {{- end }}
+{{- with .Values.smtp.mail.username }}
+  EXIVITY_MAIL_USERNAME: {{ . | b64enc }}
+{{- end }}
+{{- with .Values.smtp.mail.password }}
+  EXIVITY_MAIL_PASSWORD: {{ . | b64enc }}
+{{- end }}
diff --git a/charts/exivity/values.schema.json b/charts/exivity/values.schema.json
index 48ae16d4..37098cad 100644
--- a/charts/exivity/values.schema.json
+++ b/charts/exivity/values.schema.json
@@ -10,7 +10,6 @@
     "secret",
     "ingress",
     "storage",
-    "smtp",
     "logfiles",
     "postgresql",
     "rabbitmq",
@@ -192,18 +191,16 @@
           "properties": {
             "driver": { "type": "string" },
             "host": { "type": "string" },
-            "port": { "type": "string" },
+            "port": { "type": "integer" },
             "encryption": { "type": "string" },
             "smtpVerifyPeer": { "type": "boolean" },
             "fromAddress": { "type": "string" },
             "fromName": { "type": "string" },
             "username": { "type": "string" },
             "password": { "type": "string" }
-          },
-          "required": ["driver", "host", "port", "encryption", "smtpVerifyPeer", "fromAddress", "fromName", "username", "password"]
+          }
         }
-      },
-      "required": ["mail"]
+      }
     },
     "logfiles": {
       "type": "object",
@@ -2806,7 +2803,7 @@
         }
       ]
     },
-   
+
     "logLevel": {
       "type": "object",
       "default": {},
diff --git a/charts/exivity/values.yaml b/charts/exivity/values.yaml
index 5f79be62..26d38338 100644
--- a/charts/exivity/values.yaml
+++ b/charts/exivity/values.yaml
@@ -80,19 +80,19 @@ storage:
 
 smtp:
   mail:
-    driver: "smtp"           # Mail driver to use (e.g. smtp)
-    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: ""          # Sender email address eg: noreply@exivity.com
-    fromName: ""             # Sender name eg: Exivity
-    username: "exivity"      # SMTP username 
-    password: "Exivity123!"  # SMTP password 
+    driver: "smtp" # Mail driver to use (e.g. smtp)
+    # 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: ""          # Sender email address eg: noreply@exivity.com
+    # fromName: ""                    # Sender name eg: Exivity
+    # username: "info@your-domain"      # SMTP username
+    # password: "SuperSecure"  # SMTP password
 
 logfiles:
-  deleteDays: 365          # Delete logfiles after N days
-  compressDays: 30         # Compress logfiles after N days
+  deleteDays: 365 # Delete logfiles after N days
+  compressDays: 30 # Compress logfiles after N days
 
 # Configuration for PostgreSQL, either as an embedded database using the Bitnami PostgreSQL chart or an external database.
 # It is recommended to use an external PostgreSQL server for production environments to ensure scalability and manageability.

From b75f01b3361a80b6d1b1cbcf862973fa611c40e9 Mon Sep 17 00:00:00 2001
From: Steffen Exler <linuxluigi@users.noreply.github.com>
Date: Wed, 28 May 2025 13:48:11 +0200
Subject: [PATCH 07/15] chore: refactor SMTP configuration to use
 communications structure and enhance schema documentation

Signed-off-by: Steffen Exler <linuxluigi@users.noreply.github.com>
---
 .../templates/smtp/smtp-configmap.yaml        | 28 ++++----
 .../exivity/templates/smtp/smtp-secret.yaml   |  4 +-
 charts/exivity/values.schema.json             | 72 +++++++++++++++----
 charts/exivity/values.yaml                    | 25 ++++---
 4 files changed, 90 insertions(+), 39 deletions(-)

diff --git a/charts/exivity/templates/smtp/smtp-configmap.yaml b/charts/exivity/templates/smtp/smtp-configmap.yaml
index 058fae4a..51c2e010 100644
--- a/charts/exivity/templates/smtp/smtp-configmap.yaml
+++ b/charts/exivity/templates/smtp/smtp-configmap.yaml
@@ -5,24 +5,24 @@ metadata:
   labels:
     {{- include "exivity.labels" $ | indent 4 }}
 data:
-  {{- if .Values.smtp.mail.driver }}
-  EXIVITY_MAIL_DRIVER: {{ .Values.smtp.mail.driver | quote }}
+  {{- if .Values.communications.smtp.driver }}
+  EXIVITY_MAIL_DRIVER: {{ .Values.communications.smtp.driver | quote }}
   {{- end }}
-  {{- if .Values.smtp.mail.host }}
-  EXIVITY_MAIL_HOST: {{ .Values.smtp.mail.host | quote }}
+  {{- if .Values.communications.smtp.host }}
+  EXIVITY_MAIL_HOST: {{ .Values.communications.smtp.host | quote }}
   {{- end }}
-  {{- if .Values.smtp.mail.port }}
-  EXIVITY_MAIL_PORT: {{ .Values.smtp.mail.port | quote }}
+  {{- if .Values.communications.smtp.port }}
+  EXIVITY_MAIL_PORT: {{ .Values.communications.smtp.port | quote }}
   {{- end }}
-  {{- if .Values.smtp.mail.fromAddress }}
-  EXIVITY_MAIL_FROM_ADDRESS: {{ .Values.smtp.mail.fromAddress | quote }}
+  {{- if .Values.communications.smtp.fromAddress }}
+  EXIVITY_MAIL_FROM_ADDRESS: {{ .Values.communications.smtp.fromAddress | quote }}
   {{- end }}
-  {{- if .Values.smtp.mail.fromName }}
-  EXIVITY_MAIL_FROM_NAME: {{ .Values.smtp.mail.fromName | quote }}
+  {{- if .Values.communications.smtp.fromName }}
+  EXIVITY_MAIL_FROM_NAME: {{ .Values.communications.smtp.fromName | quote }}
   {{- end }}
-  {{- if .Values.smtp.mail.encryption }}
-  EXIVITY_MAIL_ENCRYPTION: {{ .Values.smtp.mail.encryption | quote }}
+  {{- if .Values.communications.smtp.encryption }}
+  EXIVITY_MAIL_ENCRYPTION: {{ .Values.communications.smtp.encryption | quote }}
   {{- end }}
-  {{- if .Values.smtp.mail.smtpVerifyPeer }}
-  EXIVITY_MAIL_SMTP_VERIFY_PEER: {{ .Values.smtp.mail.smtpVerifyPeer | quote }}
+  {{- if .Values.communications.smtp.smtpVerifyPeer }}
+  EXIVITY_MAIL_SMTP_VERIFY_PEER: {{ .Values.communications.smtp.smtpVerifyPeer | quote }}
   {{- end }}
diff --git a/charts/exivity/templates/smtp/smtp-secret.yaml b/charts/exivity/templates/smtp/smtp-secret.yaml
index d4cbb113..44f0b064 100644
--- a/charts/exivity/templates/smtp/smtp-secret.yaml
+++ b/charts/exivity/templates/smtp/smtp-secret.yaml
@@ -5,9 +5,9 @@ metadata:
   labels:
     {{- include "exivity.labels" $ | indent 4 }}
 data:
-{{- with .Values.smtp.mail.username }}
+{{- with .Values.communications.smtp.auth.username }}
   EXIVITY_MAIL_USERNAME: {{ . | b64enc }}
 {{- end }}
-{{- with .Values.smtp.mail.password }}
+{{- with .Values.communications.smtp.auth.password }}
   EXIVITY_MAIL_PASSWORD: {{ . | b64enc }}
 {{- end }}
diff --git a/charts/exivity/values.schema.json b/charts/exivity/values.schema.json
index 37098cad..8083ac09 100644
--- a/charts/exivity/values.schema.json
+++ b/charts/exivity/values.schema.json
@@ -183,22 +183,70 @@
         }
       ]
     },
-    "smtp": {
+    "communications": {
       "type": "object",
       "properties": {
-        "mail": {
+        "smtp": {
           "type": "object",
           "properties": {
-            "driver": { "type": "string" },
-            "host": { "type": "string" },
-            "port": { "type": "integer" },
-            "encryption": { "type": "string" },
-            "smtpVerifyPeer": { "type": "boolean" },
-            "fromAddress": { "type": "string" },
-            "fromName": { "type": "string" },
-            "username": { "type": "string" },
-            "password": { "type": "string" }
-          }
+            "driver": {
+              "type": "string",
+              "description": "Mail driver to use, e.g. smtp"
+            },
+            "host": {
+              "type": "string",
+              "format": "hostname",
+              "description": "SMTP server hostname"
+            },
+            "port": {
+              "type": "integer",
+              "minimum": 1,
+              "maximum": 65535,
+              "description": "SMTP server port"
+            },
+            "encryption": {
+              "type": "string",
+              "enum": ["none", "ssl", "tls"],
+              "description": "One of: none | ssl | tls"
+            },
+            "verifyPeer": {
+              "type": "boolean",
+              "description": "Verify certificate trust chain and hostname"
+            },
+            "fromAddress": {
+              "type": "string",
+              "format": "email",
+              "description": "Sender email address"
+            },
+            "fromName": {
+              "type": "string",
+              "description": "Sender name"
+            },
+            "auth": {
+              "type": "object",
+              "properties": {
+                "username": {
+                  "type": "string",
+                  "description": "SMTP username"
+                },
+                "password": {
+                  "type": "string",
+                  "description": "SMTP password"
+                }
+              },
+              "required": ["username"],
+              "additionalProperties": false
+            }
+          },
+          "required": [
+            "host",
+            "port",
+            "encryption",
+            "fromAddress",
+            "fromName",
+            "auth"
+          ],
+          "additionalProperties": false
         }
       }
     },
diff --git a/charts/exivity/values.yaml b/charts/exivity/values.yaml
index 26d38338..7f96d317 100644
--- a/charts/exivity/values.yaml
+++ b/charts/exivity/values.yaml
@@ -78,17 +78,20 @@ storage:
       import: 1Gi
       report: 1Gi
 
-smtp:
-  mail:
-    driver: "smtp" # Mail driver to use (e.g. smtp)
-    # 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: ""          # Sender email address eg: noreply@exivity.com
-    # fromName: ""                    # Sender name eg: Exivity
-    # username: "info@your-domain"      # SMTP username
-    # password: "SuperSecure"  # SMTP password
+communications:
+  {}
+  # SMTP settings
+  # smtp:
+  #   driver: smtp # mail "driver" (e.g. smtp)
+  #   host: smtp.example.com # SMTP server hostname
+  #   port: 465 # SMTP server port
+  #   encryption: tls # one of: none | ssl | tls
+  #   verifyPeer: true # verify certificate trust chain and hostname
+  #   fromAddress: noreply@exivity.com
+  #   fromName: Exivity
+  #   auth:
+  #     username: info@your-domain
+  #     password: SuperSecure
 
 logfiles:
   deleteDays: 365 # Delete logfiles after N days

From 56cd1eb556ccbc8b809a4a868b6202a27023c0fe Mon Sep 17 00:00:00 2001
From: xiangyisss <xiangyisunn@gmail.com>
Date: Wed, 28 May 2025 15:48:03 +0200
Subject: [PATCH 08/15] chore: remove log files option

---
 .../exivity/templates/proximity/cli.deployment.yaml |  3 ---
 .../templates/proximity/logfiles.configmap.yaml     |  9 ---------
 charts/exivity/values.schema.json                   | 13 -------------
 3 files changed, 25 deletions(-)
 delete mode 100644 charts/exivity/templates/proximity/logfiles.configmap.yaml

diff --git a/charts/exivity/templates/proximity/cli.deployment.yaml b/charts/exivity/templates/proximity/cli.deployment.yaml
index 2c375ea2..646672f2 100644
--- a/charts/exivity/templates/proximity/cli.deployment.yaml
+++ b/charts/exivity/templates/proximity/cli.deployment.yaml
@@ -20,7 +20,6 @@ spec:
         checksum/{{- include "exivity.fullname" $ -}}-config-proximity-cli: {{ include (print $.Template.BasePath "/proximity/cli.configmap.yaml") . | sha256sum }}
         checksum/{{- include "exivity.fullname" $ -}}-proximity-cli-env: {{ include (print $.Template.BasePath "/proximity/cli.env.yaml") . | sha256sum }}
         checksum/{{- include "exivity.fullname" $ -}}-secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
-        checksum/{{- include "exivity.fullname" $ -}}-config-logfiles: {{ include (print $.Template.BasePath "/proximity/logfiles.configmap.yaml") . | sha256sum }}
     spec:
       securityContext:
         {{- include "exivity.securityContext" (dict "root" . "component" "proximityCli") | indent 8 }}
@@ -72,8 +71,6 @@ spec:
           envFrom:
             - configMapRef:
                 name: {{ include "exivity.fullname" $ -}}-proximity-cli-env
-            - configMapRef:
-                name: {{ include "exivity.fullname" $ -}}-config-logfiles
             - secretRef:
                 name: {{ include "exivity.fullname" $ -}}-app-key
             - secretRef:
diff --git a/charts/exivity/templates/proximity/logfiles.configmap.yaml b/charts/exivity/templates/proximity/logfiles.configmap.yaml
deleted file mode 100644
index 0696a6c6..00000000
--- a/charts/exivity/templates/proximity/logfiles.configmap.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "exivity.fullname" $ }}-config-logfiles
-  labels:
-    {{- include "exivity.labels" $ | indent 4 }}
-data:
-  EXIVITY_LOGFILES_DELETE_DAYS: "{{ .Values.logfiles.deleteDays }}"
-  EXIVITY_LOGFILES_COMPRESS_DAYS: "{{ .Values.logfiles.compressDays }}"
diff --git a/charts/exivity/values.schema.json b/charts/exivity/values.schema.json
index 8083ac09..ea867de5 100644
--- a/charts/exivity/values.schema.json
+++ b/charts/exivity/values.schema.json
@@ -10,7 +10,6 @@
     "secret",
     "ingress",
     "storage",
-    "logfiles",
     "postgresql",
     "rabbitmq",
     "service",
@@ -250,14 +249,6 @@
         }
       }
     },
-    "logfiles": {
-      "type": "object",
-      "properties": {
-        "deleteDays": { "type": "integer" },
-        "compressDays": { "type": "integer" }
-      },
-      "required": ["deleteDays", "compressDays"]
-    },
     "postgresql": {
       "type": "object",
       "default": {},
@@ -3122,10 +3113,6 @@
           "password": ""
         }
       },
-      "logfiles": {
-        "deleteDays": 0,
-        "compressDays": 0
-      },
       "postgresql": {
         "enabled": true,
         "global": {

From 66cbbed60239793ade629d41f1a5d2ec10f3019d Mon Sep 17 00:00:00 2001
From: xiangyisss <xiangyisunn@gmail.com>
Date: Wed, 28 May 2025 15:51:05 +0200
Subject: [PATCH 09/15] chore: fix helm lint

---
 .../templates/smtp/smtp-configmap.yaml        | 32 +++++++++++--------
 .../exivity/templates/smtp/smtp-secret.yaml   | 13 ++++----
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/charts/exivity/templates/smtp/smtp-configmap.yaml b/charts/exivity/templates/smtp/smtp-configmap.yaml
index 51c2e010..5627545c 100644
--- a/charts/exivity/templates/smtp/smtp-configmap.yaml
+++ b/charts/exivity/templates/smtp/smtp-configmap.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.communications.smtp }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -5,24 +6,27 @@ metadata:
   labels:
     {{- include "exivity.labels" $ | indent 4 }}
 data:
-  {{- if .Values.communications.smtp.driver }}
-  EXIVITY_MAIL_DRIVER: {{ .Values.communications.smtp.driver | quote }}
+  {{- with .Values.communications.smtp }}
+  {{- if .driver }}
+  EXIVITY_MAIL_DRIVER: {{ .driver | quote }}
   {{- end }}
-  {{- if .Values.communications.smtp.host }}
-  EXIVITY_MAIL_HOST: {{ .Values.communications.smtp.host | quote }}
+  {{- if .host }}
+  EXIVITY_MAIL_HOST: {{ .host | quote }}
   {{- end }}
-  {{- if .Values.communications.smtp.port }}
-  EXIVITY_MAIL_PORT: {{ .Values.communications.smtp.port | quote }}
+  {{- if .port }}
+  EXIVITY_MAIL_PORT: {{ .port | quote }}
   {{- end }}
-  {{- if .Values.communications.smtp.fromAddress }}
-  EXIVITY_MAIL_FROM_ADDRESS: {{ .Values.communications.smtp.fromAddress | quote }}
+  {{- if .fromAddress }}
+  EXIVITY_MAIL_FROM_ADDRESS: {{ .fromAddress | quote }}
   {{- end }}
-  {{- if .Values.communications.smtp.fromName }}
-  EXIVITY_MAIL_FROM_NAME: {{ .Values.communications.smtp.fromName | quote }}
+  {{- if .fromName }}
+  EXIVITY_MAIL_FROM_NAME: {{ .fromName | quote }}
   {{- end }}
-  {{- if .Values.communications.smtp.encryption }}
-  EXIVITY_MAIL_ENCRYPTION: {{ .Values.communications.smtp.encryption | quote }}
+  {{- if .encryption }}
+  EXIVITY_MAIL_ENCRYPTION: {{ .encryption | quote }}
   {{- end }}
-  {{- if .Values.communications.smtp.smtpVerifyPeer }}
-  EXIVITY_MAIL_SMTP_VERIFY_PEER: {{ .Values.communications.smtp.smtpVerifyPeer | quote }}
+  {{- if .smtpVerifyPeer }}
+  EXIVITY_MAIL_SMTP_VERIFY_PEER: {{ .smtpVerifyPeer | quote }}
   {{- end }}
+  {{- end }}
+{{- end }}
diff --git a/charts/exivity/templates/smtp/smtp-secret.yaml b/charts/exivity/templates/smtp/smtp-secret.yaml
index 44f0b064..7f9b33c2 100644
--- a/charts/exivity/templates/smtp/smtp-secret.yaml
+++ b/charts/exivity/templates/smtp/smtp-secret.yaml
@@ -1,13 +1,12 @@
+{{- if and .Values.communications.smtp .Values.communications.smtp.auth .Values.communications.smtp.auth.username .Values.communications.smtp.auth.password }}
 apiVersion: v1
-kind:       Secret
+kind: Secret
 metadata:
-  name: {{ include "exivity.fullname" $ -}}-smtp-secret
+  name: {{ include "exivity.fullname" $ }}-smtp-secret
   labels:
     {{- include "exivity.labels" $ | indent 4 }}
+type: Opaque
 data:
-{{- with .Values.communications.smtp.auth.username }}
-  EXIVITY_MAIL_USERNAME: {{ . | b64enc }}
-{{- end }}
-{{- with .Values.communications.smtp.auth.password }}
-  EXIVITY_MAIL_PASSWORD: {{ . | b64enc }}
+  EXIVITY_MAIL_USERNAME: {{ .Values.communications.smtp.auth.username | b64enc }}
+  EXIVITY_MAIL_PASSWORD: {{ .Values.communications.smtp.auth.password | b64enc }}
 {{- end }}

From cf8066a0f740c4b66d5981783f528842c6808d2d Mon Sep 17 00:00:00 2001
From: xiangyisss <xiangyisunn@gmail.com>
Date: Wed, 28 May 2025 16:29:48 +0200
Subject: [PATCH 10/15] chore: remove logfiles from values.yaml

---
 charts/exivity/values.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/charts/exivity/values.yaml b/charts/exivity/values.yaml
index 7f96d317..224163b4 100644
--- a/charts/exivity/values.yaml
+++ b/charts/exivity/values.yaml
@@ -93,9 +93,6 @@ communications:
   #     username: info@your-domain
   #     password: SuperSecure
 
-logfiles:
-  deleteDays: 365 # Delete logfiles after N days
-  compressDays: 30 # Compress logfiles after N days
 
 # Configuration for PostgreSQL, either as an embedded database using the Bitnami PostgreSQL chart or an external database.
 # It is recommended to use an external PostgreSQL server for production environments to ensure scalability and manageability.

From dbee07ab5d0041b1867115cb114975d9d3008bf7 Mon Sep 17 00:00:00 2001
From: xiangyisss <xiangyisunn@gmail.com>
Date: Fri, 30 May 2025 11:50:14 +0200
Subject: [PATCH 11/15] chore: update SMTP configuration to conditionally
 include settings in deployment and configmap templates

---
 .../exivity/templates/pigeon/deployment.yaml  |  2 +
 .../templates/proximity/api.deployment.yaml   |  6 +--
 .../templates/smtp/smtp-configmap.yaml        | 48 +++++++++----------
 3 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/charts/exivity/templates/pigeon/deployment.yaml b/charts/exivity/templates/pigeon/deployment.yaml
index 10083a64..559d980d 100644
--- a/charts/exivity/templates/pigeon/deployment.yaml
+++ b/charts/exivity/templates/pigeon/deployment.yaml
@@ -61,10 +61,12 @@ spec:
           envFrom:
             - secretRef:
                 name: {{ include "exivity.fullname" $ -}}-app-key
+            {{- if and .Values.communications .Values.communications.smtp }}
             - secretRef:
                 name: {{ include "exivity.fullname" $ -}}-smtp-secret
             - configMapRef:
                 name: {{ include "exivity.fullname" $ -}}-config-smtp
+            {{- end }}
           env:
             - name:  REDIS_HOST
               value: exivity-redis-master
diff --git a/charts/exivity/templates/proximity/api.deployment.yaml b/charts/exivity/templates/proximity/api.deployment.yaml
index a7a03e13..9c7a132d 100644
--- a/charts/exivity/templates/proximity/api.deployment.yaml
+++ b/charts/exivity/templates/proximity/api.deployment.yaml
@@ -38,8 +38,6 @@ spec:
                   name: {{ include "exivity.fullname" $ -}}-licence-pub
               - secret:
                   name: {{ include "exivity.fullname" $ -}}-licence-key
-              - configMap:
-                  name: {{ include "exivity.fullname" $ -}}-config-smtp
         - name: exivity-lock
           configMap:
             name: {{ include "exivity.fullname" $ -}}-lock
@@ -136,10 +134,12 @@ spec:
                 name: {{ include "exivity.fullname" $ -}}-jwt-secret
             - configMapRef:
                 name: {{ include "exivity.fullname" $ -}}-proximity-api-env
+            {{- if and .Values.communications .Values.communications.smtp }}
             - secretRef:
                 name: {{ include "exivity.fullname" $ -}}-smtp-secret
             - configMapRef:
-                name: {{ include "exivity.fullname" $ -}}-config-smtp
+                name: {{ include "exivity.fullname" . }}-config-smtp
+            {{- end }}
           {{- include "exivity.probes" $ | indent 10}}
       {{- with .Values.service.pullSecrets }}
       imagePullSecrets:
diff --git a/charts/exivity/templates/smtp/smtp-configmap.yaml b/charts/exivity/templates/smtp/smtp-configmap.yaml
index 5627545c..b7fffa22 100644
--- a/charts/exivity/templates/smtp/smtp-configmap.yaml
+++ b/charts/exivity/templates/smtp/smtp-configmap.yaml
@@ -1,4 +1,3 @@
-{{- if .Values.communications.smtp }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -6,27 +5,26 @@ metadata:
   labels:
     {{- include "exivity.labels" $ | indent 4 }}
 data:
-  {{- with .Values.communications.smtp }}
-  {{- if .driver }}
-  EXIVITY_MAIL_DRIVER: {{ .driver | quote }}
-  {{- end }}
-  {{- if .host }}
-  EXIVITY_MAIL_HOST: {{ .host | quote }}
-  {{- end }}
-  {{- if .port }}
-  EXIVITY_MAIL_PORT: {{ .port | quote }}
-  {{- end }}
-  {{- if .fromAddress }}
-  EXIVITY_MAIL_FROM_ADDRESS: {{ .fromAddress | quote }}
-  {{- end }}
-  {{- if .fromName }}
-  EXIVITY_MAIL_FROM_NAME: {{ .fromName | quote }}
-  {{- end }}
-  {{- if .encryption }}
-  EXIVITY_MAIL_ENCRYPTION: {{ .encryption | quote }}
-  {{- end }}
-  {{- if .smtpVerifyPeer }}
-  EXIVITY_MAIL_SMTP_VERIFY_PEER: {{ .smtpVerifyPeer | quote }}
-  {{- end }}
-  {{- end }}
-{{- end }}
+  {{- if and .Values.communications .Values.communications.smtp }}
+    {{- if .Values.communications.smtp.driver }}
+  EXIVITY_MAIL_DRIVER: {{ .Values.communications.smtp.driver | quote }}
+    {{- end }}
+    {{- if .Values.communications.smtp.host }}
+  EXIVITY_MAIL_HOST: {{ .Values.communications.smtp.host | quote }}
+    {{- end }}
+    {{- if .Values.communications.smtp.port }}
+  EXIVITY_MAIL_PORT: {{ .Values.communications.smtp.port | quote }}
+    {{- end }}
+    {{- if .Values.communications.smtp.fromAddress }}
+  EXIVITY_MAIL_FROM_ADDRESS: {{ .Values.communications.smtp.fromAddress | quote }}
+    {{- end }}
+    {{- if .Values.communications.smtp.fromName }}
+  EXIVITY_MAIL_FROM_NAME: {{ .Values.communications.smtp.fromName | quote }}
+    {{- end }}
+    {{- if .Values.communications.smtp.encryption }}
+  EXIVITY_MAIL_ENCRYPTION: {{ .Values.communications.smtp.encryption | quote }}
+    {{- end }}
+    {{- if .Values.communications.smtp.smtpVerifyPeer }}
+  EXIVITY_MAIL_SMTP_VERIFY_PEER: {{ .Values.communications.smtp.smtpVerifyPeer | quote }}
+    {{- end }}
+  {{- end }}
\ No newline at end of file

From feac806fa7cdf074af89c51b82f250c24393a9ef Mon Sep 17 00:00:00 2001
From: Steffen Exler <linuxluigi@users.noreply.github.com>
Date: Mon, 2 Jun 2025 11:43:20 +0200
Subject: [PATCH 12/15] chore: update release-notes action to use specific
 authentication branch

Signed-off-by: Steffen Exler <linuxluigi@users.noreply.github.com>
---
 .github/workflows/release-notes.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release-notes.yml b/.github/workflows/release-notes.yml
index 5ef402db..2124818f 100644
--- a/.github/workflows/release-notes.yml
+++ b/.github/workflows/release-notes.yml
@@ -11,7 +11,7 @@ jobs:
   check-release-notes:
     runs-on: ubuntu-latest
     steps:
-      - uses: exivity/actions/release-notes@main
+      - uses: exivity/actions/release-notes@chore/modify-release-notes-authentication
         with:
           gh-token: ${{ secrets.GH_BOT_TOKEN }}
           jira-username: ${{ secrets.JIRA_BOT_EMAIL }}

From 3d21bb3da75360497459c040611ee8ba38fa855c Mon Sep 17 00:00:00 2001
From: Steffen Exler <linuxluigi@users.noreply.github.com>
Date: Mon, 2 Jun 2025 11:47:27 +0200
Subject: [PATCH 13/15] chore: update release-notes action to use main branch
 for authentication

Signed-off-by: Steffen Exler <linuxluigi@users.noreply.github.com>
---
 .github/workflows/release-notes.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release-notes.yml b/.github/workflows/release-notes.yml
index 2124818f..5ef402db 100644
--- a/.github/workflows/release-notes.yml
+++ b/.github/workflows/release-notes.yml
@@ -11,7 +11,7 @@ jobs:
   check-release-notes:
     runs-on: ubuntu-latest
     steps:
-      - uses: exivity/actions/release-notes@chore/modify-release-notes-authentication
+      - uses: exivity/actions/release-notes@main
         with:
           gh-token: ${{ secrets.GH_BOT_TOKEN }}
           jira-username: ${{ secrets.JIRA_BOT_EMAIL }}

From a10cb7ac98877400743194e97f04688dd5246fc6 Mon Sep 17 00:00:00 2001
From: Steffen Exler <linuxluigi@users.noreply.github.com>
Date: Mon, 2 Jun 2025 11:50:18 +0200
Subject: [PATCH 14/15] chore: update release-notes action to use specific
 authentication branch

Signed-off-by: Steffen Exler <linuxluigi@users.noreply.github.com>
---
 .github/workflows/release-notes.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release-notes.yml b/.github/workflows/release-notes.yml
index 5ef402db..2124818f 100644
--- a/.github/workflows/release-notes.yml
+++ b/.github/workflows/release-notes.yml
@@ -11,7 +11,7 @@ jobs:
   check-release-notes:
     runs-on: ubuntu-latest
     steps:
-      - uses: exivity/actions/release-notes@main
+      - uses: exivity/actions/release-notes@chore/modify-release-notes-authentication
         with:
           gh-token: ${{ secrets.GH_BOT_TOKEN }}
           jira-username: ${{ secrets.JIRA_BOT_EMAIL }}

From 5a18a3942c895e883f74069d689e0861429626d5 Mon Sep 17 00:00:00 2001
From: Steffen Exler <linuxluigi@users.noreply.github.com>
Date: Mon, 2 Jun 2025 11:51:42 +0200
Subject: [PATCH 15/15] chore: update release-notes action to use main branch
 for authentication

Signed-off-by: Steffen Exler <linuxluigi@users.noreply.github.com>
---
 .github/workflows/release-notes.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release-notes.yml b/.github/workflows/release-notes.yml
index 2124818f..5ef402db 100644
--- a/.github/workflows/release-notes.yml
+++ b/.github/workflows/release-notes.yml
@@ -11,7 +11,7 @@ jobs:
   check-release-notes:
     runs-on: ubuntu-latest
     steps:
-      - uses: exivity/actions/release-notes@chore/modify-release-notes-authentication
+      - uses: exivity/actions/release-notes@main
         with:
           gh-token: ${{ secrets.GH_BOT_TOKEN }}
           jira-username: ${{ secrets.JIRA_BOT_EMAIL }}