From 40aec0e803409e16ef46db557010c9f6de7c0bff Mon Sep 17 00:00:00 2001 From: case0sh Date: Wed, 25 Oct 2023 12:09:26 +0200 Subject: [PATCH] fixes --- charts/ocis/docs/values-desc-table.adoc | 8 ++++---- charts/ocis/docs/values.adoc.yaml | 10 +++++----- charts/ocis/templates/notifications/deployment.yaml | 4 ++-- charts/ocis/values.yaml | 10 +++++----- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/charts/ocis/docs/values-desc-table.adoc b/charts/ocis/docs/values-desc-table.adoc index feb25a51d..15d6b0678 100644 --- a/charts/ocis/docs/values-desc-table.adoc +++ b/charts/ocis/docs/values-desc-table.adoc @@ -262,14 +262,14 @@ a| [subs=-attributes] a| [subs=-attributes] +string+ a| [subs=-attributes] -`"none"` -| Authentication method for the SMTP communication. Possible values are ‘login’, ‘plain’, ‘crammd5’, ‘none’ If set to another value than `none`, a secret referenced by `notificationsSmtpSecretRef` needs to be present. +`"auto"` +| Authentication method for the SMTP communication. Possible values are ‘login’, ‘plain’, ‘crammd5’, ‘none’, 'auto' If set to another value than `none`, a secret referenced by `notificationsSmtpSecretRef` needs to be present. | features.emailNotifications.smtp.encryption a| [subs=-attributes] +string+ a| [subs=-attributes] -`"auto"` -| Values 'ssl' and 'tls' are deprecated and will be removed in version "6.0.0". Use 'starttls' instead of 'tls' and 'ssltls' instead of 'ssl'. +`"none"` +| Values 'ssl' and 'tls' are deprecated and will be removed in oCIS release 6.0.0. Use 'starttls' instead of 'tls' and 'ssltls' instead of 'ssl'. | features.emailNotifications.smtp.host a| [subs=-attributes] +string+ diff --git a/charts/ocis/docs/values.adoc.yaml b/charts/ocis/docs/values.adoc.yaml index 091aed20b..ce160e6f0 100644 --- a/charts/ocis/docs/values.adoc.yaml +++ b/charts/ocis/docs/values.adoc.yaml @@ -168,12 +168,12 @@ features: port: # -- Sender address of emails that will be sent. Example: 'ownCloud ' sender: - # -- Authentication method for the SMTP communication. Possible values are ‘login’, ‘plain’, ‘crammd5’, ‘none’ + # -- Authentication method for the SMTP communication. Possible values are ‘login’, ‘plain’, ‘crammd5’, ‘none’, 'auto' # If set to another value than `none`, a secret referenced by `notificationsSmtpSecretRef` needs to be present. - authentication: none - # -- Encryption method for the SMTP communication. Possible values are ‘starttls’, ‘ssltls’, ‘auto’ and ‘none’. - # -- Values 'ssl' and 'tls' are deprecated and will be removed in version "6.0.0". Use 'starttls' instead of 'tls' and 'ssltls' instead of 'ssl'. - encryption: auto + authentication: auto + # -- Encryption method for the SMTP communication. Possible values are ‘starttls’, ‘ssltls’ and ‘none’. + # -- Values 'ssl' and 'tls' are deprecated and will be removed in oCIS release 6.0.0. Use 'starttls' instead of 'tls' and 'ssltls' instead of 'ssl'. + encryption: none branding: # -- Enables mail branding. If enabled, you need to provide the text and html template ConfigMap. # The image ConfigMap is optional. diff --git a/charts/ocis/templates/notifications/deployment.yaml b/charts/ocis/templates/notifications/deployment.yaml index 8d38de102..e76b8b1e8 100644 --- a/charts/ocis/templates/notifications/deployment.yaml +++ b/charts/ocis/templates/notifications/deployment.yaml @@ -26,7 +26,7 @@ spec: {{- include "ocis.containerSecurityContext" . | nindent 10 }} env: {{- include "ocis.serviceRegistry" . | nindent 12 }} - + - name: OCIS_DEFAULT_LANGUAGE value: {{ default "en" .Values.features.language.default | quote }} @@ -64,7 +64,7 @@ spec: - name: NOTIFICATIONS_SMTP_ENCRYPTION value: {{ .Values.features.emailNotifications.smtp.encryption | quote }} - {{- if ne .Values.features.emailNotifications.smtp.authentication "none" }} + {{- if ne .Values.features.emailNotifications.smtp.authentication "auto" }} - name: NOTIFICATIONS_SMTP_USERNAME valueFrom: secretKeyRef: diff --git a/charts/ocis/values.yaml b/charts/ocis/values.yaml index 3dc591deb..c91c317ce 100644 --- a/charts/ocis/values.yaml +++ b/charts/ocis/values.yaml @@ -167,12 +167,12 @@ features: port: # -- Sender address of emails that will be sent. Example: 'ownCloud ' sender: - # -- Authentication method for the SMTP communication. Possible values are ‘login’, ‘plain’, ‘crammd5’, ‘none’ + # -- Authentication method for the SMTP communication. Possible values are ‘login’, ‘plain’, ‘crammd5’, ‘none’, 'auto' # If set to another value than `none`, a secret referenced by `notificationsSmtpSecretRef` needs to be present. - authentication: none - # -- Encryption method for the SMTP communication. Possible values are ‘starttls’, ‘ssltls’, ‘auto’ and ‘none’. - # -- Values 'ssl' and 'tls' are deprecated and will be removed in version "6.0.0". Use 'starttls' instead of 'tls' and 'ssltls' instead of 'ssl'. - encryption: auto + authentication: auto + # -- Encryption method for the SMTP communication. Possible values are ‘starttls’, ‘ssltls’ and ‘none’. + # -- Values 'ssl' and 'tls' are deprecated and will be removed in oCIS release 6.0.0. Use 'starttls' instead of 'tls' and 'ssltls' instead of 'ssl'. + encryption: none branding: # -- Enables mail branding. If enabled, you need to provide the text and html template ConfigMap. # The image ConfigMap is optional.