fixes as per comments

Signed-off-by: Mehdi Bechiri <[email protected]>

charts/eth-validator-watcher/Chart.yaml

@@ -3,6 +3,7 @@ description: A Helm chart for running eth-validator-watcher
 name: eth-validator-watcher
 type: application
 version: 1.1.0
+appVersion: latest
 maintainers:
   - name: Alluvial
     email: [email protected]

charts/eth-validator-watcher/README.md

@@ -1,29 +1,29 @@
 # 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)
+![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: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square)
 
 A Helm chart for running eth-validator-watcher
 
 ## Maintainers
 
 | Name | Email | Url |
 | ---- | ------ | --- |
-| Alluvial | [email protected] | https://alluvial.finance |
+| Alluvial | <[email protected]> | <https://alluvial.finance> |
 
 ## Values
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| watchedKeys | list | `[]` | List of public keys to watch. See https://github.com/kilnfi/eth-validator-watcher/blob/main/README.md#command-lines-examples |
 | watcher.affinity | object | `{}` |  |
 | watcher.config.beaconType | string | `"other"` |  |
 | watcher.config.beaconUrl | string | `"http://localhost:5052"` |  |
+| watcher.config.watchedKeys | list | `[]` | List of public keys to watch. See https://github.com/kilnfi/eth-validator-watcher/blob/main/README.md#command-lines-examples |
 | watcher.extraArgs | list | `[]` |  |
 | watcher.extraInitContainers | list | `[]` |  |
 | watcher.fullnameOverride | string | `""` |  |
 | watcher.image.pullPolicy | string | `"IfNotPresent"` |  |
 | watcher.image.repository | string | `"ghcr.io/kilnfi/eth-validator-watcher"` |  |
-| watcher.image.tag | string | `"v0.41.0"` |  |
+| watcher.image.tag | string | `""` |  |
 | watcher.imagePullSecrets | list | `[]` |  |
 | watcher.livenessProbe.failureThreshold | int | `1` |  |
 | watcher.livenessProbe.initialDelaySeconds | int | `60` |  |
@@ -62,4 +62,4 @@ A Helm chart for running eth-validator-watcher
 | watcher.volumes | object | `{}` |  |
 
 ----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.7.0](https://github.com/norwoodj/helm-docs/releases/v1.7.0)
+Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0)

charts/eth-validator-watcher/templates/configmap.yaml

@@ -0,0 +1,13 @@
+{{- if .Values.config.watchedKeys }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "eth-validator-watcher.fullname" . }}
+  labels:
+    {{- include "eth-validator-watcher.labels" . | nindent 4 }}
+data:
+  watched-keys.txt: |
+  {{- range .Values.config.watchedKeys }}
+  {{- . | nindent 4 }}
+  {{- end }}
+{{- end }}

charts/eth-validator-watcher/templates/deployment.yaml

@@ -5,12 +5,12 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
   {{- include "ethereum-validator-watcher.labels" . | nindent 4 }}
-  {{- with .Values.deploymentAnnotations }}
+  {{- with .Values.watcher.podAnnotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
-  replicas: {{ .Values.replicaCount }}
+  replicas: {{ .Values.watcher.replicaCount }}
   selector:
     matchLabels:
       {{- include "ethereum-validator-watcher.matchLabels" . | nindent 6 }}
@@ -27,7 +27,7 @@ spec:
     spec:
       containers:
       - name: validator-watcher
-        image: "{{ .Values.watcher.image.repository }}:{{ .Values.watcher.image.tag | default "latest" }}"
+        image: "{{ .Values.watcher.image.repository }}:{{ .Values.watcher.image.tag | default .Chart.AppVersion }}"
         imagePullPolicy: {{ .Values.watcher.image.pullPolicy }}
         {{- with .Values.watcher.resources }}
         resources:
@@ -37,6 +37,9 @@ spec:
         - name: metrics
           containerPort: 8000
         args:
+          {{- if .Values.watcher.config.watchedKeys }}
+          - --pubkeys-file-path=/data/keys/watched-keys.txt
+          {{- end }}
           - --beacon-url={{ .Values.watcher.config.beaconUrl }}
           - --beacon-type={{ .Values.watcher.config.beaconType }}
           - --liveness-file=/tmp/liveness
@@ -70,10 +73,21 @@ spec:
           failureThreshold: {{ .failureThreshold }}
         {{- end }}
         volumeMounts:
+        {{- if .Values.watcher.config.watchedKeys }}
+          - name: "watched-keys"
+            mountPath: "/data/keys"
+            readOnly: true
+         {{- end }}
         {{- with .Values.watcher.volumeMounts }}
           {{- toYaml . | nindent 12 }}
         {{- end }}
       serviceAccountName: {{ include "ethereum-validator-watcher.serviceAccountName" . }}
       volumes:
-      {{- with .Values.volumes }}
+      {{- if .Values.watcher.config.watchedKeys }}
+        - name: "watched-keys"
+          configMap:
+              name: {{ include "ethereum-validator-watcher.fullname" . }}
+      {{- end }}
+      {{- with .Values.watcher.volumes }}
         {{- toYaml . | nindent 8 }}
+      {{- end }}

charts/eth-validator-watcher/values.yaml

@@ -3,7 +3,7 @@ watcher:
   image:
     repository: ghcr.io/kilnfi/eth-validator-watcher
     pullPolicy: IfNotPresent
-    tag: latest
+    tag: ""
 
   imagePullSecrets: []
   nameOverride: ""
@@ -12,6 +12,8 @@ watcher:
   config:
     beaconUrl: "http://localhost:5052"
     beaconType: "other"
+    # -- List of public keys to watch. See https://github.com/kilnfi/eth-validator-watcher/blob/main/README.md#command-lines-examples
+    watchedKeys: []
 
   extraArgs: []
   podAnnotations: {}
@@ -61,6 +63,3 @@ watcher:
     scheme: http
     tlsConfig: {}
     relabelings: []
-
-# -- List of public keys to watch. See https://github.com/kilnfi/eth-validator-watcher/blob/main/README.md#command-lines-examples
-watchedKeys: []