From fcccfa2bfd2a81e33072a00258a9480eef2f0ff2 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Thu, 5 Jan 2017 16:58:33 +0530 Subject: [PATCH] fixed SMTP parameter naming --- incubator/suitecrm/README.md | 10 +++++----- incubator/suitecrm/templates/deployment.yaml | 10 +++++----- incubator/suitecrm/templates/secrets.yaml | 2 +- incubator/suitecrm/values.yaml | 12 ++++++------ 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/incubator/suitecrm/README.md b/incubator/suitecrm/README.md index f4000ba71..c3e00cd1f 100644 --- a/incubator/suitecrm/README.md +++ b/incubator/suitecrm/README.md @@ -55,11 +55,11 @@ The following tables lists the configurable parameters of the SuiteCRM chart and | `suitecrmLastName` | Last name | `Name` | | `suitecrmHost` | Host domain or IP | `nil` | | `suitecrmLoadBalancerIP` | `LoadBalancerIP for the application` | `nil` | -| `smtpHost` | SMTP host | `nil` | -| `smtpPort` | SMTP port | `nil` | -| `smtpProtocol` | SMTP Protocol | `nil` | -| `smtpUser` | SMTP user | `nil` | -| `smtpPassword` | SMTP password | `nil` | +| `suiteSmtpHost` | SMTP host | `nil` | +| `suiteSmtpPort` | SMTP port | `nil` | +| `suiteSmtpProtocol` | SMTP Protocol | `nil` | +| `suiteSmtpUser` | SMTP user | `nil` | +| `suiteSmtpPassword` | SMTP password | `nil` | | `mariadb.mariadbRootPassword` | MariaDB admin password | `nil` | | `serviceType` | Kubernetes Service type | `LoadBalancer` | | `persistence.enabled` | Enable persistence using PVC | `true` | diff --git a/incubator/suitecrm/templates/deployment.yaml b/incubator/suitecrm/templates/deployment.yaml index a73d8d7b8..09eaff97d 100644 --- a/incubator/suitecrm/templates/deployment.yaml +++ b/incubator/suitecrm/templates/deployment.yaml @@ -41,18 +41,18 @@ spec: - name: SUITECRM_HOST value: {{ default "" .Values.suitecrmHost | quote }} - name: SUITECRM_SMTP_HOST - value: {{ default "" .Values.smtpHost | quote }} + value: {{ default "" .Values.suitecrmSmtpHost | quote }} - name: SUITECRM_SMTP_PORT - value: {{ default "" .Values.smtpPort | quote }} + value: {{ default "" .Values.suitecrmSmtpPort | quote }} - name: SUITECRM_SMTP_USER - value: {{ default "" .Values.smtpUser | quote }} + value: {{ default "" .Values.suitecrmSmtpUser | quote }} - name: SUITECRM_SMTP_PASSWORD valueFrom: secretKeyRef: name: {{ template "fullname" . }} - key: smtp-password + key: suitecrm-smtp-password - name: SUITECRM_SMTP_PROTOCOL - value: {{ default "" .Values.smtpProtocol | quote }} + value: {{ default "" .Values.suitecrmSmtpProtocol | quote }} ports: - name: http containerPort: 80 diff --git a/incubator/suitecrm/templates/secrets.yaml b/incubator/suitecrm/templates/secrets.yaml index 29a0f99fa..0a2ad1227 100644 --- a/incubator/suitecrm/templates/secrets.yaml +++ b/incubator/suitecrm/templates/secrets.yaml @@ -14,4 +14,4 @@ data: {{- else }} suitecrm-password: {{ randAlphaNum 10 | b64enc | quote }} {{- end }} - smtp-password: {{ default "" .Values.smtpPassword | b64enc | quote }} + suitecrm-smtp-password: {{ default "" .Values.suitecrmSmtpPassword | b64enc | quote }} diff --git a/incubator/suitecrm/values.yaml b/incubator/suitecrm/values.yaml index cf0e64612..e653afcfa 100644 --- a/incubator/suitecrm/values.yaml +++ b/incubator/suitecrm/values.yaml @@ -42,13 +42,13 @@ suitecrmEmail: user@example.com ## SMTP mail delivery configuration -## ref: https://github.com/bitnami/bitnami-docker-suitecrm#smtp-configuration +## ref: https://github.com/bitnami/bitnami-docker-suitecrm/#smtp-configuration ## -# smtpHost: -# smtpPort: -# smtpUser: -# smtpPassword: -# smtpProtocol: +# suitecrmSmtpHost: +# suitecrmSmtpPort: +# suitecrmSmtpUser: +# suitecrmSmtpPassword: +# suitecrmSmtpProtocol: ## ## MariaDB chart configuration