From c6094fbb55c32f1a220132702c36e8fdd183e4a4 Mon Sep 17 00:00:00 2001 From: Patrik Fuhrmann Date: Tue, 11 Jun 2019 04:06:15 +0200 Subject: [PATCH] [stable/nextcloud] More consistent values and secrets (#14680) Signed-off-by: Patrik Fuhrmann --- stable/nextcloud/Chart.yaml | 2 +- stable/nextcloud/README.md | 15 +++++----- stable/nextcloud/templates/deployment.yaml | 34 +++++----------------- stable/nextcloud/templates/secrets.yaml | 7 ----- stable/nextcloud/values.yaml | 14 ++++----- 5 files changed, 24 insertions(+), 48 deletions(-) diff --git a/stable/nextcloud/Chart.yaml b/stable/nextcloud/Chart.yaml index 8794086783..f3456ff7ec 100644 --- a/stable/nextcloud/Chart.yaml +++ b/stable/nextcloud/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: nextcloud -version: 1.2.0 +version: 1.2.1 appVersion: 16.0.1 description: A file sharing server that puts the control and security of your own data back into your hands. keywords: diff --git a/stable/nextcloud/README.md b/stable/nextcloud/README.md index dc998ff27d..0ed12bda3d 100644 --- a/stable/nextcloud/README.md +++ b/stable/nextcloud/README.md @@ -61,14 +61,15 @@ The following table lists the configurable parameters of the nextcloud chart and | `nextcloud.update` | Trigger update if custom command is used | `0` | | `nextcloud.datadir` | nextcloud data dir location | `/var/www/html/data` | | `nextcloud.tableprefix` | nextcloud db table prefix | `''` | -| `nextcloud.smtp.host` | SMTP hostname | `nil` | -| `nextcloud.smtp.secure` | SMTP connection `ssl` or empty | `''` | -| `nextcloud.smtp.port` | Optional SMTP port | `nil` | -| `nextcloud.smtp.authtype` | SMTP authentication method | `LOGIN` | -| `nextcloud.smtp.name` | SMTP username | `''` | -| `nextcloud.smtp.password` | SMTP password | `''` | -| `nextcloud.mail.fromaddress` | nextcloud mail send from field | `nil` | +| `nextcloud.mail.enabled` | Whether to enable/disable email settings | `false` | +| `nextcloud.mail.fromAddress` | nextcloud mail send from field | `nil` | | `nextcloud.mail.domain` | nextcloud mail domain | `nil` | +| `nextcloud.mail.smtp.host` | SMTP hostname | `nil` | +| `nextcloud.mail.smtp.secure` | SMTP connection `ssl` or empty | `''` | +| `nextcloud.mail.smtp.port` | Optional SMTP port | `nil` | +| `nextcloud.mail.smtp.authtype` | SMTP authentication method | `LOGIN` | +| `nextcloud.mail.smtp.name` | SMTP username | `''` | +| `nextcloud.mail.smtp.password` | SMTP password | `''` | | `internalDatabase.enabled` | Whether to use internal sqlite database | `true` | | `internalDatabase.database` | Name of the existing database | `nextcloud` | | `externalDatabase.enabled` | Whether to use external database | `false` | diff --git a/stable/nextcloud/templates/deployment.yaml b/stable/nextcloud/templates/deployment.yaml index 367b38d892..11ec118f1c 100644 --- a/stable/nextcloud/templates/deployment.yaml +++ b/stable/nextcloud/templates/deployment.yaml @@ -89,26 +89,18 @@ spec: value: {{ .Values.nextcloud.tableprefix | quote }} {{- end }} {{- if .Values.nextcloud.mail.enabled }} + - name: MAIL_FROM_ADDRESS + value: {{ .Values.nextcloud.mail.fromAddress | quote }} + - name: MAIL_DOMAIN + value: {{ .Values.nextcloud.mail.domain | quote }} - name: SMTP_HOST - valueFrom: - secretKeyRef: - name: {{ template "nextcloud.fullname" . }} - key: smtp-host + value: {{ .Values.nextcloud.mail.smtp.host | quote }} - name: SMTP_SECURE - valueFrom: - secretKeyRef: - name: {{ template "nextcloud.fullname" . }} - key: smtp-secure + value: {{ .Values.nextcloud.mail.smtp.secure | quote }} - name: SMTP_PORT - valueFrom: - secretKeyRef: - name: {{ template "nextcloud.fullname" . }} - key: smtp-port + value: {{ .Values.nextcloud.mail.smtp.port | quote }} - name: SMTP_AUTHTYPE - valueFrom: - secretKeyRef: - name: {{ template "nextcloud.fullname" . }} - key: smtp-authtype + value: {{ .Values.nextcloud.mail.smtp.authtype | quote }} - name: SMTP_NAME valueFrom: secretKeyRef: @@ -119,16 +111,6 @@ spec: secretKeyRef: name: {{ template "nextcloud.fullname" . }} key: smtp-password - - name: MAIL_FROM_ADDRESS - valueFrom: - secretKeyRef: - name: {{ template "nextcloud.fullname" . }} - key: mail-from - - name: MAIL_DOMAIN - valueFrom: - secretKeyRef: - name: {{ template "nextcloud.fullname" . }} - key: mail-domain {{- end }} ports: - name: http diff --git a/stable/nextcloud/templates/secrets.yaml b/stable/nextcloud/templates/secrets.yaml index 981a8e6827..8473eba052 100644 --- a/stable/nextcloud/templates/secrets.yaml +++ b/stable/nextcloud/templates/secrets.yaml @@ -16,13 +16,6 @@ data: nextcloud-password: {{ randAlphaNum 10 | b64enc | quote }} {{ end }} {{- if .Values.nextcloud.mail.enabled }} - smtp-host: {{ .Values.nextcloud.mail.smtp.host | b64enc | quote }} - smtp-secure: {{ .Values.nextcloud.mail.smtp.secure | b64enc | quote }} - smtp-port: {{ .Values.nextcloud.mail.smtp.port | b64enc | quote }} - smtp-authtype: {{ .Values.nextcloud.mail.smtp.authtype | b64enc | quote }} smtp-username: {{ default "" .Values.nextcloud.mail.smtp.name | b64enc | quote }} smtp-password: {{ default "" .Values.nextcloud.mail.smtp.password | b64enc | quote }} - mail-from: {{ .Values.nextcloud.mail.fromaddress | b64enc | quote }} - mail-domain: {{ .Values.nextcloud.mail.domain | b64enc | quote }} {{- end }} - \ No newline at end of file diff --git a/stable/nextcloud/values.yaml b/stable/nextcloud/values.yaml index 56b0be1fb0..d759a4b84a 100644 --- a/stable/nextcloud/values.yaml +++ b/stable/nextcloud/values.yaml @@ -66,15 +66,15 @@ nextcloud: tableprefix: mail: enabled: false - fromaddress: "user" - domain: "domain.com" + fromAddress: user + domain: domain.com smtp: - host: "domain.com" - secure: "ssl" - port: "465" + host: domain.com + secure: ssl + port: 465 authtype: LOGIN - name: "user" - password: "pass" + name: user + password: pass internalDatabase: enabled: true