[stable/datadog] Fix trace agent and useConfigMap (#21317)

Signed-off-by: Gerard Godone-Maresca <ggodonemaresca+github@gmail.com>

Co-authored-by: Gerard Godone-Maresca <ggodonemaresca+github@gmail.com>

stable/datadog/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## 2.0
 
+## 2.0.3
+
+* Fix templating error when `agents.useConfigMap` is set to true.
+* Add DD_APM_ENABLED environment variable to trace agent container.
+
 ## 2.0.2
 
 * Revert the docker socket path inside the agent container to its standard location to fix #21223

stable/datadog/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 name: datadog
-version: 2.0.2
+version: 2.0.3
 appVersion: "7"
 description: DataDog Agent
 keywords:

stable/datadog/templates/container-trace-agent.yaml

@@ -14,6 +14,8 @@
     {{- include "containers-common-env" . | nindent 4 }}
     - name: DD_LOG_LEVEL
       value: {{ .Values.agents.containers.traceAgent.logLevel | default .Values.datadog.logLevel | quote }}
+    - name: DD_APM_ENABLED
+      value: "true"
     - name: DD_APM_NON_LOCAL_TRAFFIC
       value: "true"
     - name: DD_APM_RECEIVER_PORT

stable/datadog/templates/datadog-yaml-configmap.yaml

@@ -35,7 +35,7 @@ data:
       max_memory: 0
       max_cpu_percent: 0
 
-    {{- $version := (.Values.image.tag | toString | trimSuffix "-jmx") }}
+    {{- $version := (.Values.agents.image.tag | toString | trimSuffix "-jmx") }}
     {{- $length := len (split "." $version ) -}} 
     {{- if and (eq $length 1) (ge $version "6") -}}
     {{- $version := "6.15" }}