feat: support for additionalEnv

Signed-off-by: Tao Li <[email protected]>
EnterpriseDB · Dec 18, 2024 · a71a4e5 · a71a4e5
1 parent daa4db4
commit a71a4e5
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 1 deletion.
diff --git a/charts/edb-postgres-distributed-for-kubernetes/README.md b/charts/edb-postgres-distributed-for-kubernetes/README.md
@@ -31,6 +31,7 @@ EDB Postgres Distributed for Kubernetes Helm Chart
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | additionalArgs | list | `[]` | Additional arguments to be added to the operator's args list |
+| additionalEnv | list | `[]` | Array containing extra environment variables which can be templated. For example:  - name: RELEASE_NAME    value: "{{ .Release.Name }}"  - name: MY_VAR    value: "mySpecialKey" |
 | affinity | object | `{}` | Affinity for the operator to be installed |
 | cert-manager.enabled | bool | `true` |  |
 | cert-manager.installCRDs | bool | `true` |  |

diff --git a/...stributed-for-kubernetes/charts/edb-postgres-for-kubernetes-lts/templates/deployment.yaml b/...stributed-for-kubernetes/charts/edb-postgres-for-kubernetes-lts/templates/deployment.yaml
@@ -78,7 +78,7 @@ spec:
         - name: MONITORING_QUERIES_CONFIGMAP
           value: "{{ .Values.monitoringQueriesConfigMap.name }}"
         {{- if .Values.additionalEnv }}
-        {{- tpl (.Values.additionalEnvVars | toYaml) . | nindent 8 }}
+        {{- tpl (.Values.additionalEnv | toYaml) . | nindent 8 }}
         {{- end }}
         {{ if not .Values.config.clusterWide -}}
         - name: WATCH_NAMESPACE

diff --git a/charts/edb-postgres-distributed-for-kubernetes/templates/deployment.yaml b/charts/edb-postgres-distributed-for-kubernetes/templates/deployment.yaml
@@ -70,6 +70,9 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
+        {{- if .Values.additionalEnv }}
+        {{- tpl (.Values.additionalEnv | toYaml) . | nindent 8 }}
+        {{- end }}
         image: "{{- include "edb-postgres-distributed-for-kubernetes.operatorImageName" . }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         livenessProbe:

diff --git a/charts/edb-postgres-distributed-for-kubernetes/values.schema.json b/charts/edb-postgres-distributed-for-kubernetes/values.schema.json
@@ -5,6 +5,9 @@
         "additionalArgs": {
             "type": "array"
         },
+        "additionalEnv": {
+            "type": "array"
+        },
         "affinity": {
             "type": "object"
         },

diff --git a/charts/edb-postgres-distributed-for-kubernetes/values.yaml b/charts/edb-postgres-distributed-for-kubernetes/values.yaml
@@ -105,6 +105,14 @@ config:
 # -- Additional arguments to be added to the operator's args list
 additionalArgs: []
 
+# -- Array containing extra environment variables which can be templated.
+# For example:
+#  - name: RELEASE_NAME
+#    value: "{{ .Release.Name }}"
+#  - name: MY_VAR
+#    value: "mySpecialKey"
+additionalEnv: []
+
 serviceAccount:
   # -- Specifies whether the service account should be created
   create: true