Add 'additionalEnvVars' to the chart

charts/cloudnative-pg/Chart.yaml

@@ -18,7 +18,7 @@ name: cloudnative-pg
 description: CloudNativePG Operator Helm Chart
 icon: https://raw.githubusercontent.com/cloudnative-pg/artwork/main/cloudnativepg-logo.svg
 type: application
-version: "0.21.2"
+version: "0.22.0"
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning, they should reflect the version the application is using.

charts/cloudnative-pg/README.md

@@ -27,6 +27,7 @@ CloudNativePG Operator Helm Chart
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | additionalArgs | list | `[]` | Additinal arguments to be added to the operator's args list. |
+| additionalEnvVars | list | `[]` | Array containing extra environment variables which can be templated. See [values.yaml](./values.yaml) for examples.
 | affinity | object | `{}` | Affinity for the operator to be installed. |
 | commonAnnotations | object | `{}` | Annotations to be added to all other resources. |
 | config | object | `{"create":true,"data":{},"name":"cnpg-controller-manager-config","secret":false}` | Operator configuration. |

charts/cloudnative-pg/templates/_helpers.tpl

@@ -60,3 +60,17 @@ Create the name of the service account to use
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}
 {{- end }}
+
+{{/*
+Renders a value that contains template
+Usage:
+{{ include "cloudnative-pg.extraEnv" ( dict "value" .Values.example.value "context" $ ) }}
+*/}}
+{{- define "cloudnative-pg.extraEnv" -}}
+{{- $value := typeIs "string" .value | ternary .value (.value | toYaml) }}
+{{- if contains "{{" (toJson .value) }}
+    {{- tpl $value .context }}
+{{- else }}
+    {{- $value }}
+{{- end }}
+{{- end -}}

charts/cloudnative-pg/templates/deployment.yaml

@@ -72,6 +72,9 @@ spec:
               fieldPath: metadata.namespace
         - name: MONITORING_QUERIES_CONFIGMAP
           value: "{{ .Values.monitoringQueriesConfigMap.name }}"
+        {{- if .Values.additionalEnvVars }}
+        {{- include "cloudnative-pg.extraEnv" (dict "value" .Values.additionalEnvVars "context" . ) | nindent 8 }}
+        {{- end }}
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         livenessProbe:

charts/cloudnative-pg/values.yaml

@@ -66,6 +66,14 @@ config:
 # -- Additinal arguments to be added to the operator's args list.
 additionalArgs: []
 
+# -- Array containing extra environment variables which can be templated.
+# For example:
+#  - name: WATCH_NAMESPACE
+#    value: "{{ .Release.Namespace }}"
+#  - name: MY_VAR
+#    value: "mySpecialKey"
+additionalEnvVars: []
+
 serviceAccount:
   # -- Specifies whether the service account should be created.
   create: true