chore: update smtp configuration and enhance deployment references

Author: xiangyisss

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:

charts/exivity/templates/proximity/logfiles.configmap.yaml

@@ -1,28 +1,32 @@
+{{- if .Values.communications.smtp }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "exivity.fullname" $ }}-config-smtp
   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 }}

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

@@ -1,13 +1,20 @@
+{{- if .Values.communications.smtp }}
+  {{- with .Values.communications.smtp.auth }}
+    {{- if or .username .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 }}
-{{- end }}
+  {{- if .username }}
+  EXIVITY_MAIL_USERNAME: {{ .username | b64enc }}
+  {{- end }}
+  {{- if .password }}
+  EXIVITY_MAIL_PASSWORD: {{ .password | b64enc }}
+  {{- end }}
+    {{- end }}
+  {{- end }}
+{{- end }}

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

@@ -10,7 +10,6 @@
     "secret",
     "ingress",
     "storage",
-    "logfiles",
     "postgresql",
     "rabbitmq",
     "service",
@@ -238,26 +237,10 @@
               "additionalProperties": false
             }
           },
-          "required": [
-            "host",
-            "port",
-            "encryption",
-            "fromAddress",
-            "fromName",
-            "auth"
-          ],
           "additionalProperties": false
         }
       }
     },
-    "logfiles": {
-      "type": "object",
-      "properties": {
-        "deleteDays": { "type": "integer" },
-        "compressDays": { "type": "integer" }
-      },
-      "required": ["deleteDays", "compressDays"]
-    },
     "postgresql": {
       "type": "object",
       "default": {},
@@ -3122,10 +3105,6 @@
           "password": ""
         }
       },
-      "logfiles": {
-        "deleteDays": 0,
-        "compressDays": 0
-      },
       "postgresql": {
         "enabled": true,
         "global": {