fix dd_nodename

DataDog · Oct 31, 2024 · 0afeb1d · 0afeb1d
1 parent 20b93ee
commit 0afeb1d
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/charts/datadog/templates/_containers-common-env.yaml b/charts/datadog/templates/_containers-common-env.yaml
@@ -31,8 +31,15 @@
   value: "0"
 {{- end }}
 {{- if .Values.providers.gke.gdc }}
+- name: DD_NODE_NAME
+  valueFrom:
+    fieldRef:
+      apiVersion: v1
+      fieldPath: spec.nodeName
 - name: DD_HOSTNAME
   value: "$(DD_NODE_NAME)-$(DD_CLUSTER_NAME)"
+- name: DD_LOGS_CONFIG_RUN_PATH # todo: gdc remove this?
+  value: {{ include "datadog.hostMountRoot" . }}
 {{- end }}
 {{- if eq .Values.targetSystem "linux" }}
 {{- if .Values.providers.eks.ec2.useHostnameFromFile }}
@@ -132,10 +139,6 @@
 {{- if eq .Values.targetSystem "windows" }}
   value: npipe://{{ (include "datadog.dockerOrCriSocketPath" .) | replace "\\" "/" }}
 {{- end }}
-{{- if .Values.providers.gke.gdc }}
-- name: DD_LOGS_CONFIG_RUN_PATH
-  value: {{ include "datadog.hostMountRoot" . }}
-{{- end }}
 {{- end }}
 {{- end }}
 {{- end }}