diff --git a/bitnami/grafana-operator/CHANGELOG.md b/bitnami/grafana-operator/CHANGELOG.md
index dd4df03bd50996..bc0ce203908199 100644
--- a/bitnami/grafana-operator/CHANGELOG.md
+++ b/bitnami/grafana-operator/CHANGELOG.md
@@ -1,8 +1,13 @@
# Changelog
-## 4.6.4 (2024-09-19)
+## 4.7.0 (2024-09-23)
-* [bitnami/grafana-operator] Release 4.6.4 ([#29508](https://github.com/bitnami/charts/pull/29508))
+* [bitnami/grafana-operator] Enable env in grafana ([#29553](https://github.com/bitnami/charts/pull/29553))
+
+## 4.6.4 (2024-09-19)
+
+* [bitnami/grafana-operator] Release 4.6.4 (#29508) ([a0e1c75](https://github.com/bitnami/charts/commit/a0e1c75e5caf51c3ed5b85dde87d26884ad815cf)), closes [#29508](https://github.com/bitnami/charts/issues/29508)
+* [bitnami/grafana-operator] Remove duplicated text in README.md (#29410) ([242cdb0](https://github.com/bitnami/charts/commit/242cdb07c5bbc3cae671349a67a6a1c00bf01a2c)), closes [#29410](https://github.com/bitnami/charts/issues/29410)
## 4.6.3 (2024-09-12)
diff --git a/bitnami/grafana-operator/Chart.yaml b/bitnami/grafana-operator/Chart.yaml
index 2078933b05968f..ef5f643b9154b1 100644
--- a/bitnami/grafana-operator/Chart.yaml
+++ b/bitnami/grafana-operator/Chart.yaml
@@ -30,4 +30,4 @@ maintainers:
name: grafana-operator
sources:
- https://github.com/bitnami/charts/tree/main/bitnami/grafana-operator
-version: 4.6.4
+version: 4.7.0
diff --git a/bitnami/grafana-operator/README.md b/bitnami/grafana-operator/README.md
index 9d65fb78e7a80b..2f0880fdcfc4ae 100644
--- a/bitnami/grafana-operator/README.md
+++ b/bitnami/grafana-operator/README.md
@@ -364,6 +364,7 @@ extraDeploy:
| `grafana.pdb.create` | Enable/disable a Pod Disruption Budget creation | `false` |
| `grafana.pdb.minAvailable` | Minimum number/percentage of pods that should remain scheduled | `""` |
| `grafana.pdb.maxUnavailable` | Maximum number/percentage of pods that may be made unavailable. Defaults to `1` if both `grafana.pdb.minAvailable` and `grafana.pdb.maxUnavailable` are empty. | `""` |
+| `grafana.extraEnvVars` | Array containing extra env vars to configure Grafana | `[]` |
| `grafana.envFrom` | Extra environment variable to pass to the running container | `[]` |
| `grafana.client.timeout` | The timeout in seconds for the Grafana Rest API on that instance | `5` |
| `grafana.labels` | Add additional labels to the grafana deployment, service and ingress resources | `{}` |
diff --git a/bitnami/grafana-operator/templates/grafana.yaml b/bitnami/grafana-operator/templates/grafana.yaml
index 1ca75e45a64fb2..7df595839c0fd3 100644
--- a/bitnami/grafana-operator/templates/grafana.yaml
+++ b/bitnami/grafana-operator/templates/grafana.yaml
@@ -132,6 +132,10 @@ spec:
- name: grafana
image: {{ include "common.images.image" (dict "imageRoot" .Values.grafana.image "global" .Values.global) }}
imagePullPolicy: {{ .Values.grafana.image.pullPolicy }}
+ {{- if .Values.grafana.extraEnvVars }}
+ env:
+ {{- include "common.tplvalues.render" (dict "value" .Values.grafana.extraEnvVars "context" $) | nindent 16 }}
+ {{- end }}
{{- if .Values.grafana.envFrom }}
envFrom: {{- toYaml .Values.grafana.envFrom | nindent 16 }}
{{- end }}
diff --git a/bitnami/grafana-operator/values.yaml b/bitnami/grafana-operator/values.yaml
index 09db74b330903b..fd0c69fde12be5 100644
--- a/bitnami/grafana-operator/values.yaml
+++ b/bitnami/grafana-operator/values.yaml
@@ -666,6 +666,13 @@ grafana:
create: false
minAvailable: ""
maxUnavailable: ""
+ ## @param grafana.extraEnvVars Array containing extra env vars to configure Grafana
+ ## For example:
+ ## extraEnvVars:
+ ## - name: MY_ENV
+ ## value: my-env-value
+ ##
+ extraEnvVars: []
## @param grafana.envFrom Extra environment variable to pass to the running container
## Ref: https://github.com/integr8ly/grafana-operator/blob/master/documentation/deploy_grafana.md#configuring-the-deployment
## e.g: