Skip to content

Commit

Permalink
[newrelic-logging] Adjust order of env list in daemonset
Browse files Browse the repository at this point in the history
When using persistentVolume mode, the env variable FB_DB references NODE_NAME. This reference is currently not resolved, because NODE_NAME is defined after FB_DB. This commit fixes this, by moving the definition of NODE_NAME before the definition of FB_DB.
  • Loading branch information
nluedema committed Oct 24, 2024
1 parent 83cef4c commit bb3988d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion charts/newrelic-logging/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
description: A Helm chart to deploy New Relic Kubernetes Logging as a DaemonSet, supporting both Linux and Windows nodes and containers
name: newrelic-logging
version: 1.23.0
version: 1.23.1
appVersion: 2.0.2
home: https://github.com/newrelic/kubernetes-logging
icon: https://newrelic.com/assets/newrelic/source/NewRelic-logo-square.svg
Expand Down
9 changes: 5 additions & 4 deletions charts/newrelic-logging/templates/daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,11 @@ spec:
{{- else }}
value: "docker,cri"
{{- end }}
# NODE_NAME needs to be defined before FB_DB, because FB_DB references NODE_NAME in its value when using persistentVolume
- name: NODE_NAME
valueFrom:
fieldRef:
fieldPath: spec.nodeName
{{- if or (not .Values.fluentBit.persistence) (eq .Values.fluentBit.persistence.mode "hostPath") }}
- name: FB_DB
value: {{ .Values.fluentBit.db | quote }}
Expand All @@ -116,10 +121,6 @@ spec:
value: {{ include "newrelic-logging.lowDataMode" . | default "false" | quote }}
- name: RETRY_LIMIT
value: {{ .Values.fluentBit.retryLimit | quote }}
- name: NODE_NAME
valueFrom:
fieldRef:
fieldPath: spec.nodeName
- name: HOSTNAME
valueFrom:
fieldRef:
Expand Down

0 comments on commit bb3988d

Please sign in to comment.