From 6452fa00c800f9dcd8bd82039b4e3ab719f51a1a Mon Sep 17 00:00:00 2001 From: Gerard Godone-Maresca <8977984+ggmaresca@users.noreply.github.com> Date: Sun, 8 Mar 2020 14:13:34 -0400 Subject: [PATCH] [stable/datadog] Fix trace agent and useConfigMap (#21317) Signed-off-by: Gerard Godone-Maresca Co-authored-by: Gerard Godone-Maresca --- stable/datadog/CHANGELOG.md | 5 +++++ stable/datadog/Chart.yaml | 2 +- stable/datadog/templates/container-trace-agent.yaml | 2 ++ stable/datadog/templates/datadog-yaml-configmap.yaml | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/stable/datadog/CHANGELOG.md b/stable/datadog/CHANGELOG.md index 87f9761346..c3ddbb86f8 100644 --- a/stable/datadog/CHANGELOG.md +++ b/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 diff --git a/stable/datadog/Chart.yaml b/stable/datadog/Chart.yaml index 9326cbaf42..6adc579c10 100644 --- a/stable/datadog/Chart.yaml +++ b/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: diff --git a/stable/datadog/templates/container-trace-agent.yaml b/stable/datadog/templates/container-trace-agent.yaml index edc9f57b8c..93bb9b23ef 100644 --- a/stable/datadog/templates/container-trace-agent.yaml +++ b/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 diff --git a/stable/datadog/templates/datadog-yaml-configmap.yaml b/stable/datadog/templates/datadog-yaml-configmap.yaml index f7d0379c80..cfb827dfe4 100644 --- a/stable/datadog/templates/datadog-yaml-configmap.yaml +++ b/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" }}