From 8d11725a1b7972fc8abbd447202174e1833f8ad0 Mon Sep 17 00:00:00 2001
From: Mehdi Bechiri <cebidhem@pm.me>
Date: Tue, 26 Sep 2023 16:04:03 +0200
Subject: [PATCH] feat(helm): add support for env/envFrom (#72)

---
 charts/eth-validator-watcher/Chart.yaml             |  2 +-
 charts/eth-validator-watcher/README.md              |  4 +++-
 .../eth-validator-watcher/templates/deployment.yaml | 13 +++++++++++++
 charts/eth-validator-watcher/values.yaml            |  2 ++
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/charts/eth-validator-watcher/Chart.yaml b/charts/eth-validator-watcher/Chart.yaml
index 853db5d..c33d824 100644
--- a/charts/eth-validator-watcher/Chart.yaml
+++ b/charts/eth-validator-watcher/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 description: A Helm chart for running eth-validator-watcher
 name: eth-validator-watcher
 type: application
-version: 1.1.0
+version: 1.2.0
 appVersion: v0.4.2
 maintainers:
   - name: Alluvial
diff --git a/charts/eth-validator-watcher/README.md b/charts/eth-validator-watcher/README.md
index fdc3e16..36700ee 100644
--- a/charts/eth-validator-watcher/README.md
+++ b/charts/eth-validator-watcher/README.md
@@ -1,6 +1,6 @@
 # eth-validator-watcher
 
-![Version: 1.1.0](https://img.shields.io/badge/Version-1.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.4.2](https://img.shields.io/badge/AppVersion-v0.4.2-informational?style=flat-square)
+![Version: 1.2.0](https://img.shields.io/badge/Version-1.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.4.2](https://img.shields.io/badge/AppVersion-v0.4.2-informational?style=flat-square)
 
 A Helm chart for running eth-validator-watcher
 
@@ -18,6 +18,8 @@ A Helm chart for running eth-validator-watcher
 | config.beaconType | string | `"other"` |  |
 | config.beaconUrl | string | `"http://localhost:5052"` |  |
 | config.watchedKeys | list | `[]` | List of public keys to watch. See https://github.com/kilnfi/eth-validator-watcher/blob/main/README.md#command-lines-examples |
+| env | object | `{}` |  |
+| envFrom | object | `{}` |  |
 | extraArgs | list | `[]` |  |
 | extraInitContainers | list | `[]` |  |
 | fullnameOverride | string | `""` |  |
diff --git a/charts/eth-validator-watcher/templates/deployment.yaml b/charts/eth-validator-watcher/templates/deployment.yaml
index 7424324..964b3c7 100644
--- a/charts/eth-validator-watcher/templates/deployment.yaml
+++ b/charts/eth-validator-watcher/templates/deployment.yaml
@@ -46,6 +46,19 @@ spec:
           {{- with .Values.extraArgs }}
           {{- toYaml . | nindent 10 }}
           {{- end }}
+        env:
+        {{- with .Values.envFrom }}
+        {{- range $key, $value := . }}
+          - name: {{ $key }}
+          {{- toYaml $value | nindent 12 }}
+        {{- end }}
+        {{- end }}
+        {{- with .Values.env }}
+        {{- range $key, $value := . }}
+          - name: {{ $key }}
+            value: {{ $value | quote }}
+        {{- end }}
+        {{- end }}
         {{- with .Values.livenessProbe }}
         livenessProbe:
           exec:
diff --git a/charts/eth-validator-watcher/values.yaml b/charts/eth-validator-watcher/values.yaml
index 04179cb..c91c7cd 100644
--- a/charts/eth-validator-watcher/values.yaml
+++ b/charts/eth-validator-watcher/values.yaml
@@ -14,6 +14,8 @@ config:
   # -- List of public keys to watch. See https://github.com/kilnfi/eth-validator-watcher/blob/main/README.md#command-lines-examples
   watchedKeys: []
 
+env: {}
+envFrom: {}
 extraArgs: []
 podAnnotations: {}
 podLabels: {}