From 6e37e693fc93d0aa074b5dee1af32ed4e5a72612 Mon Sep 17 00:00:00 2001
From: Philip Champon <pchampon@gmail.com>
Date: Sun, 1 Oct 2017 05:54:02 +0200
Subject: [PATCH] [stable/redmine] add user defined env to redmine deployment
 (#2111)

* add user defined env to redmine deployment

* update readme

* address PR comments
---
 stable/redmine/Chart.yaml                | 2 +-
 stable/redmine/README.md                 | 1 +
 stable/redmine/templates/deployment.yaml | 9 ++++++---
 stable/redmine/values.yaml               | 6 ++++++
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/stable/redmine/Chart.yaml b/stable/redmine/Chart.yaml
index fbe521b424..6f953e2cb7 100644
--- a/stable/redmine/Chart.yaml
+++ b/stable/redmine/Chart.yaml
@@ -1,5 +1,5 @@
 name: redmine
-version: 1.2.6
+version: 1.2.7
 appVersion: 3.4.2
 description: A flexible project management web application.
 keywords:
diff --git a/stable/redmine/README.md b/stable/redmine/README.md
index f88fd8c0d7..fad82927e6 100644
--- a/stable/redmine/README.md
+++ b/stable/redmine/README.md
@@ -61,6 +61,7 @@ The following tables lists the configurable parameters of the Redmine chart and
 | `redminePassword` | Application password | _random 10 character long alphanumeric string_ |
 | `redmineEmail` | Admin email | `user@example.com` |
 | `redmineLanguage` | Redmine default data language | `en` |
+| `extraVars` | Environment variables, passed to redmine | `nil` |
 | `smtpHost` | SMTP host | `nil` |
 | `smtpPort` | SMTP port | `nil` |
 | `smtpUser` | SMTP user | `nil` |
diff --git a/stable/redmine/templates/deployment.yaml b/stable/redmine/templates/deployment.yaml
index b31e394383..d84e93b0f9 100644
--- a/stable/redmine/templates/deployment.yaml
+++ b/stable/redmine/templates/deployment.yaml
@@ -19,7 +19,10 @@ spec:
         image: "{{ .Values.image }}"
         imagePullPolicy: {{ default "" .Values.imagePullPolicy | quote }}
         env:
-        {{ if .Values.databaseType.postgresql }}
+        {{- if .Values.extraVars }}
+{{ toYaml .Values.extraVars | indent 8 }}
+        {{- end }}
+        {{- if .Values.databaseType.postgresql }}
         - name: REDMINE_DB_POSTGRES
           value: {{ template "postgresql.fullname" . }}
         - name: REDMINE_DB_PASSWORD
@@ -27,7 +30,7 @@ spec:
             secretKeyRef:
               name: {{ template "postgresql.fullname" . }}
               key: postgres-password
-        {{ else }}
+        {{- else }}
         - name: REDMINE_DB_MYSQL
           value: {{ template "mariadb.fullname" . }}
         - name: REDMINE_DB_PASSWORD
@@ -35,7 +38,7 @@ spec:
             secretKeyRef:
               name: {{ template "mariadb.fullname" . }}
               key: mariadb-root-password
-        {{ end }}
+        {{- end }}
         - name: REDMINE_USERNAME
           value: {{ default "" .Values.redmineUsername | quote }}
         - name: REDMINE_PASSWORD
diff --git a/stable/redmine/values.yaml b/stable/redmine/values.yaml
index c769f6a68c..50fafd4e4e 100644
--- a/stable/redmine/values.yaml
+++ b/stable/redmine/values.yaml
@@ -38,6 +38,12 @@ redmineLanguage: en
 # smtpPassword:
 # smtpTls:
 
+## Environment variables, to pass to the entry point
+##
+# extraVars:
+#   - name: NAMI_DEBUG
+#     value: --log-level trace
+
 ## Database configuration. Please note that only one of the following databases should be selected.
 ## ref: https://github.com/bitnami/bitnami-docker-redmine#run-the-application-using-postgresql-database
 ##