[bitnami/grafana] Fix extraEnvVars and extraConfigmaps in values.yaml

Signed-off-by: Miguel A. Cabrera Minagorri <mcabrera@vmware.com>
This commit is contained in:
Miguel Ángel Cabrera Miñagorri
2021-10-21 11:01:16 +02:00
committed by GitHub
parent ad3729ef43
commit df0bf64abf
3 changed files with 19 additions and 19 deletions
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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) | `[]` |
+16 -16
View File
@@ -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: []