[bitnami/phpmyadmin]Add extra environment variables (#3090)

* [bitnami/phpmyadmin] Add extra env vars

Signed-off-by: joancafom <jcarmona@bitnami.com>

* Chart version bump

* Fix typo in README

* Add extra environments via existing secret

* Add extra environments via existing secret

* Add missing line

* Apply envFrom feedback

Author: Jose Antonio Carmona

bitnami/phpmyadmin/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 name: phpmyadmin
-version: 6.2.2
+version: 6.3.0
 appVersion: 5.0.2
 description: phpMyAdmin is an mysql administration frontend
 keywords:

bitnami/phpmyadmin/README.md

@@ -78,6 +78,9 @@ The following table lists the configurable parameters of the phpMyAdmin chart an
 | `ingress.hosts[0].tls`       | Utilize TLS backend in ingress                                                                          | `false`                                                      |
 | `ingress.hosts[0].tlsHosts`  | Array of TLS hosts for ingress record (defaults to `ingress.hosts[0].name` if `nil`)                    | `nil`                                                        |
 | `ingress.hosts[0].tlsSecret` | TLS Secret (certificates)                                                                               | `phpmyadmin.local-tls-secret`                                |
+| `extraEnvVars`               | Any extra environment variables to be passed to the pod (evaluated as a template)                       | `{}`                                                         |
+| `extraEnvVarsCM`             | Name of a Config Map containing extra environment variables to be passed to the pod (evaluated as a template) | `nil`                                                  |
+| `extraEnvVarsSecret`         | Secret with extra environment variables                                                                 | `nil`                                                        |
 | `podSecurityContext`         | phpMyAdmin pods' Security Context                                                                       | `{ fsGroup: "1001" }`                                        |
 | `containerSecurityContext`   | phpMyAdmin containers' Security Context                                                                 | `{ runAsUser: "1001" }`                                      |
 | `resources.limits`           | The resources limits for the PhpMyAdmin container                                                       | `{}`                                                         |

bitnami/phpmyadmin/requirements.lock

@@ -4,6 +4,6 @@ dependencies:
   version: 0.3.1
 - name: mariadb
   repository: https://charts.bitnami.com/bitnami
-  version: 7.5.2
-digest: sha256:9ca28a4ae468e82cc858182cd4f0ba76173b96b68a72e38bdc4b1f1a12603b00
-generated: "2020-06-24T08:30:55.358041592Z"
+  version: 7.6.1
+digest: sha256:28cd91c08e3443ace7dc0a5a2ff9762c27045a4b66a9f52924338d2732b3a7ac
+generated: "2020-07-10T15:17:50.003664+02:00"

bitnami/phpmyadmin/templates/deployment.yaml

@@ -100,6 +100,18 @@ spec:
             - name: DATABASE_SSL_VERIFY
               value: {{ ternary "yes" "no" .Values.db.ssl.verify | quote }}
             {{- end }}
+            {{- if .Values.extraEnvVars }}
+            {{- include "phpmyadmin.tplValue" (dict "value" .Values.extraEnvVars "context" $) | nindent 12 }}
+            {{- end }}
+          envFrom:
+          {{- if .Values.extraEnvVarsCM }}
+            - configMapRef:
+                name: {{- include "phpmyadmin.tplValue" (dict "value" .Values.extraEnvVarsCM "context" $) | nindent 18 }}
+          {{- end }}
+          {{- if .Values.extraEnvVarsSecret }}
+            - secretRef:
+                name: {{- include "phpmyadmin.tplValue" (dict "value" .Values.extraEnvVarsSecret "context" $) | nindent 18 }}
+          {{- end }}
           ports:
             - name: http
               containerPort: 8080

bitnami/phpmyadmin/values.yaml

@@ -119,6 +119,21 @@ ingress:
       ## If TLS is set to true, you must declare what secret will store the key/certificate for TLS
       tlsSecret: phpmyadmin.local-tls
 
+## An array to add extra env vars to configure phpMyAdmin
+## For example:
+# extraEnvVars:
+# - name: PHP_UPLOAD_MAX_FILESIZE
+#   value: "80M"
+extraEnvVars: {}
+
+## Name of a ConfigMap containing extra env vars
+##
+extraEnvVarsCM:
+
+## Secret with extra environment variables
+##
+extraEnvVarsSecret:
+
 ## phpMyAdmin pods' Security Context
 ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod
 ##