From df0bf64abf68b6d4ef3d75f03b1597595e40d111 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miguel=20=C3=81ngel=20Cabrera=20Mi=C3=B1agorri?=
 <mcabrera@vmware.com>
Date: Thu, 21 Oct 2021 11:01:16 +0200
Subject: [PATCH] [bitnami/grafana] Fix extraEnvVars and extraConfigmaps in
 values.yaml

Signed-off-by: Miguel A. Cabrera Minagorri <mcabrera@vmware.com>
---
 bitnami/grafana/Chart.yaml  |  2 +-
 bitnami/grafana/README.md   |  4 ++--
 bitnami/grafana/values.yaml | 32 ++++++++++++++++----------------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/bitnami/grafana/Chart.yaml b/bitnami/grafana/Chart.yaml
index db2142348..55ab5fd86 100644
--- a/bitnami/grafana/Chart.yaml
+++ b/bitnami/grafana/Chart.yaml
@@ -24,4 +24,4 @@ name: grafana
 sources:
   - https://github.com/bitnami/bitnami-docker-grafana
   - https://grafana.com/
-version: 7.0.1
+version: 7.0.2
diff --git a/bitnami/grafana/README.md b/bitnami/grafana/README.md
index 1ad622849..31680d716 100644
--- a/bitnami/grafana/README.md
+++ b/bitnami/grafana/README.md
@@ -179,8 +179,6 @@ This solution allows to easily deploy multiple Grafana instances compared to the
 | `ldap.configuration`               | Specify content for ldap.toml configuration file                                  | `""`                 |
 | `ldap.configMapName`               | Name of the ConfigMap with the ldap.toml configuration file for Grafana           | `""`                 |
 | `ldap.secretName`                  | Name of the Secret with the ldap.toml configuration file for Grafana              | `""`                 |
-| `extraEnvVars`                     | Array containing extra env vars to configure Grafana                              | `{}`                 |
-| `extraConfigmaps`                  | Array to mount extra ConfigMaps to configure Grafana                              | `{}`                 |
 | `config.useGrafanaIniFile`         | Allows to load a `grafana.ini` file                                               | `false`              |
 | `config.grafanaIniConfigMap`       | Name of the ConfigMap containing the `grafana.ini` file                           | `""`                 |
 | `config.grafanaIniSecret`          | Name of the Secret containing the `grafana.ini` file                              | `""`                 |
@@ -252,6 +250,8 @@ This solution allows to easily deploy multiple Grafana instances compared to the
 | `grafana.extraVolumeMounts`                  | Additional volume mounts for the Grafana container                                                      | `[]`            |
 | `grafana.extraEnvVarsCM`                     | Name of existing ConfigMap containing extra env vars for %%MAIN_CONTAINER_NAME%% nodes                  | `""`            |
 | `grafana.extraEnvVarsSecret`                 | Name of existing Secret containing extra env vars for %%MAIN_CONTAINER_NAME%% nodes                     | `""`            |
+| `grafana.extraEnvVars`                       | Array containing extra env vars to configure Grafana                                                    | `{}`            |
+| `grafana.extraConfigmaps`                    | Array to mount extra ConfigMaps to configure Grafana                                                    | `{}`            |
 | `grafana.command`                            | Override default container command (useful when using custom images)                                    | `[]`            |
 | `grafana.args`                               | Override default container args (useful when using custom images)                                       | `[]`            |
 
diff --git a/bitnami/grafana/values.yaml b/bitnami/grafana/values.yaml
index 44770c50f..700ee4cc1 100644
--- a/bitnami/grafana/values.yaml
+++ b/bitnami/grafana/values.yaml
@@ -144,22 +144,6 @@ ldap:
   ## NOTE: When it's set the ldap.configuration parameter is ignored
   ##
   secretName: ""
-## @param extraEnvVars Array containing extra env vars to configure Grafana
-## For example:
-## extraEnvVars:
-##  - name: GF_DEFAULT_INSTANCE_NAME
-##    value: my-instance
-##
-extraEnvVars: {}
-## @param extraConfigmaps Array to mount extra ConfigMaps to configure Grafana
-## For example:
-## extraConfigmaps:
-##   - name: myconfigmap
-##     mountPath: /opt/bitnami/desired-path
-##     subPath: file-name.extension (optional)
-##     readOnly: true
-##
-extraConfigmaps: {}
 ## Parameters to override the default grafana.ini file.
 ## It is needed to create a configmap or a secret containing the grafana.ini file.
 ## @param config.useGrafanaIniFile Allows to load a `grafana.ini` file
@@ -437,6 +421,22 @@ grafana:
   ## @param grafana.extraEnvVarsSecret Name of existing Secret containing extra env vars for %%MAIN_CONTAINER_NAME%% nodes
   ##
   extraEnvVarsSecret: ""
+  ## @param grafana.extraEnvVars Array containing extra env vars to configure Grafana
+  ## For example:
+  ## extraEnvVars:
+  ##  - name: GF_DEFAULT_INSTANCE_NAME
+  ##    value: my-instance
+  ##
+  extraEnvVars: {}
+  ## @param grafana.extraConfigmaps Array to mount extra ConfigMaps to configure Grafana
+  ## For example:
+  ## extraConfigmaps:
+  ##   - name: myconfigmap
+  ##     mountPath: /opt/bitnami/desired-path
+  ##     subPath: file-name.extension (optional)
+  ##     readOnly: true
+  ##
+  extraConfigmaps: {}
   ## @param grafana.command Override default container command (useful when using custom images)
   ##
   command: []