From 0e8c700cb70e36bfdb821d0c10a1ea4c68f5ea6e Mon Sep 17 00:00:00 2001 From: Omer Lifshitz Date: Thu, 19 Mar 2020 10:07:23 -0400 Subject: [PATCH] stable/datadog - Set DD_APM_ENABLED to false in container-agent.yaml template (#21510) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * enable deployment annotations, bump chart version (#21502) Signed-off-by: Ryan Holt Signed-off-by: Omer Lifshitz * [stable/datalog] Do not enable the `cri` check when running on a `docker` setup (#21476) Signed-off-by: Lénaïc Huard Signed-off-by: Omer Lifshitz * [stable/datadog] Add some missing syscalls to the `system-probe` seccomp profile (#21456) The added syscalls are syscalls that an unconfined `system-probe` would do. Signed-off-by: Lénaïc Huard Signed-off-by: Omer Lifshitz * [stable/minio] corrected syntax error in statefulset (#21503) * corrected syntax error in statefulset Signed-off-by: Thomas Wilkinson * chart version bump Signed-off-by: Thomas Wilkinson Signed-off-by: Omer Lifshitz * [stable/redis-ha] Make emptyDir configurable from values (#21489) Signed-off-by: Jeroen Castelein Signed-off-by: Omer Lifshitz * Set DD_APM_ENABLED With the new Helm chart, even if `datadog.apm.enabled` is set to false, it reverts to the docker defaults (true). Having the trace-agent running in the background is pretty harmless from a resource overhead standpoint, however, the logic of the helm chart will automatically do the 8126 port-forwarding, and since we don't want non-apm customers to have this port exposed, we need to respect the chart settings. Signed-off-by: Omer Lifshitz * Bumped version Signed-off-by: Omer Lifshitz * 2.0.12 Fixed a bug where datadog.apm.enabled was not being respected Signed-off-by: Omer Lifshitz * re-applying the changes Signed-off-by: Omer Lifshitz Co-authored-by: Ryan Holt Co-authored-by: Lénaïc Huard Co-authored-by: Thomas Wilkinson Co-authored-by: Jeroen Castelein --- stable/datadog/CHANGELOG.md | 6 +++++- stable/datadog/Chart.yaml | 2 +- stable/datadog/templates/container-agent.yaml | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/stable/datadog/CHANGELOG.md b/stable/datadog/CHANGELOG.md index 25d69003fe..e249576a5f 100644 --- a/stable/datadog/CHANGELOG.md +++ b/stable/datadog/CHANGELOG.md @@ -2,6 +2,10 @@ ## 2.0 +## 2.0.14 + +* Fixed a bug where the `trace-agent` runs in the same container as `dd-agent` + ## 2.0.13 * Fix `system-probe` startup on latest versions of containerd. @@ -13,7 +17,7 @@ Message: failed to create containerd task: OCI runtime create failed: container_linux.go:349: starting container process caused "close exec fds: ensure /proc/self/fd is on procfs: operation not permitted": unknown Exit Code: 128 ``` - + ## 2.0.11 * Add missing syscalls in the `system-probe` seccomp profile diff --git a/stable/datadog/Chart.yaml b/stable/datadog/Chart.yaml index 4c3059dfea..74c6439fa1 100644 --- a/stable/datadog/Chart.yaml +++ b/stable/datadog/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: datadog -version: 2.0.13 +version: 2.0.14 appVersion: "7" description: Datadog Agent keywords: diff --git a/stable/datadog/templates/container-agent.yaml b/stable/datadog/templates/container-agent.yaml index b2e8b34128..f2a51cd382 100644 --- a/stable/datadog/templates/container-agent.yaml +++ b/stable/datadog/templates/container-agent.yaml @@ -81,6 +81,8 @@ - name: DD_KUBERNETES_POD_ANNOTATIONS_AS_TAGS value: '{{ toJson .Values.datadog.podAnnotationsAsTags }}' {{- end }} + - name: DD_APM_ENABLED + value: "false" - name: DD_LOGS_ENABLED value: {{ (default false (or .Values.datadog.logs.enabled .Values.datadog.logsEnabled)) | quote}} - name: DD_LOGS_CONFIG_CONTAINER_COLLECT_ALL