From d5356d27bada76376ab394a3bf7a1f30f6613d7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20W=C3=B6hrl?= Date: Sat, 28 Oct 2023 15:10:49 +0200 Subject: [PATCH] feat(logging): allow overriding command --- charts/newrelic-logging/templates/daemonset-windows.yaml | 4 ++++ charts/newrelic-logging/templates/daemonset.yaml | 4 ++++ charts/newrelic-logging/values.yaml | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/charts/newrelic-logging/templates/daemonset-windows.yaml b/charts/newrelic-logging/templates/daemonset-windows.yaml index e2ae53ef5..4c1387d72 100644 --- a/charts/newrelic-logging/templates/daemonset-windows.yaml +++ b/charts/newrelic-logging/templates/daemonset-windows.yaml @@ -106,11 +106,15 @@ spec: value: {{ $.Values.fluentBit.retryLimit | quote }} {{- include "newrelic-logging.extraEnv" $ | nindent 12 }} command: + {{- if .Values.windowsCommand }} + {{- toYaml .Values.windowsCommand | nindent 12 }} + {{- else }} - C:\fluent-bit\bin\fluent-bit.exe - -c - c:\fluent-bit\etc\fluent-bit.conf - -e - C:\fluent-bit\bin\out_newrelic.dll + {{- end }} {{- if $.Values.exposedPorts }} ports: {{ toYaml $.Values.exposedPorts | nindent 12 }} {{- end }} diff --git a/charts/newrelic-logging/templates/daemonset.yaml b/charts/newrelic-logging/templates/daemonset.yaml index b21dd8eb2..03703285a 100644 --- a/charts/newrelic-logging/templates/daemonset.yaml +++ b/charts/newrelic-logging/templates/daemonset.yaml @@ -111,11 +111,15 @@ spec: fieldPath: metadata.name {{- include "newrelic-logging.extraEnv" . | nindent 12 }} command: + {{- if .Values.command }} + {{- toYaml .Values.command | nindent 12 }} + {{- else }} - /fluent-bit/bin/fluent-bit - -c - /fluent-bit/etc/fluent-bit.conf - -e - /fluent-bit/bin/out_newrelic.so + {{- end }} volumeMounts: - name: fluent-bit-config mountPath: /fluent-bit/etc diff --git a/charts/newrelic-logging/values.yaml b/charts/newrelic-logging/values.yaml index ae98e6d36..d5a4aa100 100644 --- a/charts/newrelic-logging/values.yaml +++ b/charts/newrelic-logging/values.yaml @@ -284,3 +284,7 @@ windows: # -- Sets pod dnsConfig. Can also be configured with `global.dnsConfig` dnsConfig: {} + +command: [] + +windowsCommand: []