feat: support zap logger config (#76)

Signed-off-by: Maxime Leroy <[email protected]> Signed-off-by: Maxime Leroy <[email protected]>
okgolove · Oct 31, 2022 · 9fe320b · 9fe320b
1 parent 3dfae57
commit 9fe320b
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 2 deletions.
diff --git a/charts/goldpinger/Chart.yaml b/charts/goldpinger/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: "v3.6.1"
+appVersion: "v3.7.0"
 description: Goldpinger makes calls between its instances for visibility and alerting.
 home: https://github.com/bloomberg/goldpinger
 maintainers:
@@ -11,4 +11,4 @@ name: goldpinger
 sources:
   - https://github.com/bloomberg/goldpinger
   - https://github.com/okgolove/helm-charts
-version: 5.4.4
+version: 5.5.0
diff --git a/charts/goldpinger/templates/configmap.yaml b/charts/goldpinger/templates/configmap.yaml
@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "goldpinger.fullname" . }}-zap
+  labels:
+    {{- include "goldpinger.labels" . | nindent 4 }}
+data:
+  zap.json: {{ .Values.goldpinger.zapConfig | toJson }}
diff --git a/charts/goldpinger/templates/daemonset.yaml b/charts/goldpinger/templates/daemonset.yaml
@@ -36,6 +36,9 @@ spec:
         - name: goldpinger-daemon
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
+          volumeMounts:
+            - name: zap
+              mountPath: /config
           env:
             - name: HOSTNAME
               valueFrom:
@@ -73,6 +76,10 @@ spec:
               port: http
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
+      volumes:
+        - name: zap
+          configMap:
+            name: {{ include "goldpinger.fullname" . }}-zap
       {{- range $k := .Values.extraEnv }}
       {{- if and (eq $k.name "USE_HOST_IP") (eq $k.value "true") }}
       hostNetwork: true

diff --git a/charts/goldpinger/values.yaml b/charts/goldpinger/values.yaml
@@ -22,6 +22,28 @@ serviceAccount:
 
 goldpinger:
   port: 80
+  zapConfig: |
+    {
+      "level": "info",
+      "encoding": "json",
+      "outputPaths": [
+          "stdout"
+      ],
+      "errorOutputPaths": [
+          "stderr"
+      ],
+      "initialFields": {
+      },
+      "encoderConfig": {
+          "messageKey": "message",
+          "levelKey": "level",
+          "levelEncoder": "lowercase",
+          "timeKey": "ts",
+          "timeEncoder": "ISO8601",
+          "callerKey": "caller",
+          "callerEncoder": "Short"
+      }
+    }
 
 extraEnv: []