From 50acccfd14ba6d51c617bdb0f9720b199c1245aa Mon Sep 17 00:00:00 2001 From: Antoine GAGNIERE Date: Fri, 28 Aug 2026 21:26:27 +0200 Subject: [PATCH 1/4] Use get-agent-version for semverCompare --- charts/datadog/templates/_helpers.tpl | 14 ++++++++------ .../datadog/templates/datadog-yaml-configmap.yaml | 7 +------ .../datadog/templates/system-probe-configmap.yaml | 2 +- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/charts/datadog/templates/_helpers.tpl b/charts/datadog/templates/_helpers.tpl index d218cf7f63..1c865b2d81 100644 --- a/charts/datadog/templates/_helpers.tpl +++ b/charts/datadog/templates/_helpers.tpl @@ -4,7 +4,11 @@ Returns node agent version based on image tag. This assumes `agents.image.doNotCheckTag` is false. */}} {{- define "get-agent-version" -}} -{{- $version := .Values.agents.image.tag | toString | trimSuffix "-jmx" -}} +{{- $version := .Values.agents.image.tag | toString -}} +{{/* Strip build-variant suffixes (any combination/order) so version guards compare on a clean version. */}} +{{- range until 3 -}} +{{- $version = $version | trimSuffix "-jmx" | trimSuffix "-full" | trimSuffix "-fips" | trimSuffix "-servercore" -}} +{{- end -}} {{- $length := len (split "." $version) -}} {{- if and (eq $length 1) (eq $version "6") -}} {{- $version = "6.55.1" -}} @@ -679,8 +683,8 @@ Return a remote otel-agent based on `.Values` (passed as .) */}} {{- $agentTag := .Values.agents.image.tag | toString -}} {{- if hasSuffix "-full" $agentTag -}} - {{- $cleanVersion := $agentTag | trimSuffix "-full" -}} - {{- if semverCompare "<7.67.0" $cleanVersion -}} + {{/* `get-agent-version` strips the `-full` suffix and resolves floating tags, so this compares on a clean version. */}} + {{- if semverCompare "<7.67.0" (include "get-agent-version" .) -}} {{ include "image-path" (dict "root" .Values "image" .Values.agents.image) }} {{- else -}} {{- fail "Setting `7.X.Y-full` in `agents.image.tag` with `datadog.otelCollector.useStandaloneImage=true` is not supported for agent versions >= 7.67.0. Options: (1) Remove the `-full` suffix from `agents.image.tag`, or (2) Set `datadog.otelCollector.useStandaloneImage=false`." -}} @@ -1449,9 +1453,7 @@ In 7.36, `--config` was deprecated and `--cfgpath` should be used instead. {{- if .Values.providers.gke.autopilot -}} -config {{- else if not .Values.agents.image.doNotCheckTag -}} -{{- $version := .Values.agents.image.tag | toString | trimSuffix "-jmx" -}} -{{- $length := len (split "." $version ) -}} -{{- if and (gt $length 1) (not (semverCompare "^6.36.0 || ^7.36.0" $version)) -}} +{{- if not (semverCompare "^6.36.0 || ^7.36.0" (include "get-agent-version" .)) -}} --config {{- else -}} --cfgpath diff --git a/charts/datadog/templates/datadog-yaml-configmap.yaml b/charts/datadog/templates/datadog-yaml-configmap.yaml index 53b1a4ff56..1c3c3872f1 100644 --- a/charts/datadog/templates/datadog-yaml-configmap.yaml +++ b/charts/datadog/templates/datadog-yaml-configmap.yaml @@ -32,12 +32,7 @@ data: max_memory: 0 max_cpu_percent: 0 - {{- $version := (.Values.agents.image.tag | toString | trimSuffix "-jmx") }} - {{- $length := len (split "." $version ) -}} - {{- if and (eq $length 1) (ge $version "6") -}} - {{- $version := "6.15" }} - {{- end -}} - {{ if semverCompare ">=6.15" $version }} + {{ if semverCompare ">=6.15" (include "get-agent-version" .) }} # Enable java container awareness (agent version >= 6.15) jmx_use_container_support: true {{ else }} diff --git a/charts/datadog/templates/system-probe-configmap.yaml b/charts/datadog/templates/system-probe-configmap.yaml index 317fcb570d..b3f2818d87 100644 --- a/charts/datadog/templates/system-probe-configmap.yaml +++ b/charts/datadog/templates/system-probe-configmap.yaml @@ -1,6 +1,6 @@ {{- if .Values.datadog.networkMonitoring.enabled }} {{- if not .Values.agents.image.doNotCheckTag -}} -{{- $version := (.Values.agents.image.tag | toString | trimSuffix "-jmx") }} +{{- $version := (include "get-agent-version" .) }} {{- $length := len (split "." $version ) -}} {{- if (gt $length 1) }} {{- if not (semverCompare "^6.24.1-0 || ^7.24.1-0" $version) -}} From 416b437df840c3b7c6087068230906375a5b47dc Mon Sep 17 00:00:00 2001 From: Antoine GAGNIERE Date: Mon, 31 Aug 2026 17:49:57 +0200 Subject: [PATCH 2/4] Clean outdated version check --- charts/datadog/templates/datadog-yaml-configmap.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/charts/datadog/templates/datadog-yaml-configmap.yaml b/charts/datadog/templates/datadog-yaml-configmap.yaml index 1c3c3872f1..b54f235086 100644 --- a/charts/datadog/templates/datadog-yaml-configmap.yaml +++ b/charts/datadog/templates/datadog-yaml-configmap.yaml @@ -32,12 +32,7 @@ data: max_memory: 0 max_cpu_percent: 0 - {{ if semverCompare ">=6.15" (include "get-agent-version" .) }} - # Enable java container awareness (agent version >= 6.15) + # Enable java container awareness (`check-version` requires agent 6.36+/7.36+) jmx_use_container_support: true - {{ else }} - # Enable java cgroup memory awareness (agent version < 6.15) - jmx_use_cgroup_memory_limit: true - {{ end }} {{- end }} {{- end }} From 9f1827e86f41d730b04e0c0657513715e2a48999 Mon Sep 17 00:00:00 2001 From: Antoine Gagniere Date: Thu, 3 Sep 2026 10:18:41 +0200 Subject: [PATCH 3/4] Improve agent version handling in _helpers.tpl Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- charts/datadog/templates/_helpers.tpl | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/charts/datadog/templates/_helpers.tpl b/charts/datadog/templates/_helpers.tpl index 1c865b2d81..dadf5ad020 100644 --- a/charts/datadog/templates/_helpers.tpl +++ b/charts/datadog/templates/_helpers.tpl @@ -5,10 +5,8 @@ */}} {{- define "get-agent-version" -}} {{- $version := .Values.agents.image.tag | toString -}} -{{/* Strip build-variant suffixes (any combination/order) so version guards compare on a clean version. */}} -{{- range until 3 -}} -{{- $version = $version | trimSuffix "-jmx" | trimSuffix "-full" | trimSuffix "-fips" | trimSuffix "-servercore" -}} -{{- end -}} +{{/* Strip build-variant suffixes so version guards compare on a clean version. */}} +{{- $version = regexReplaceAll "(-jmx|-full|-fips|-servercore)+$" $version "" -}} {{- $length := len (split "." $version) -}} {{- if and (eq $length 1) (eq $version "6") -}} {{- $version = "6.55.1" -}} From e47c5e6a1a1bed504f63de6d67e364b3443d0a9a Mon Sep 17 00:00:00 2001 From: "dd-octo-sts[bot]" <200755185+dd-octo-sts[bot]@users.noreply.github.com> Date: Thu, 3 Sep 2026 12:16:32 +0000 Subject: [PATCH 4/4] chore: update charts - bump version for datadog to 3.241.1 (patch-version) - update changelog for datadog with version 3.241.1 - update readme for datadog --- charts/datadog/CHANGELOG.md | 4 ++++ charts/datadog/Chart.yaml | 2 +- charts/datadog/README.md | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/charts/datadog/CHANGELOG.md b/charts/datadog/CHANGELOG.md index 03e147fd94..265395f56c 100644 --- a/charts/datadog/CHANGELOG.md +++ b/charts/datadog/CHANGELOG.md @@ -1,5 +1,9 @@ # Datadog changelog +## 3.241.1 + +* Cleanup: Use get-agent-version for semverCompare ([#2885](https://github.com/DataDog/helm-charts/pull/2885)). + ## 3.241.0 * Enable the DatadogInstrumentation CRD controller (`datadog.instrumentationCrd.enabled`) by default for all Agent versions at or above 7.82.0, and install its CRD without unrelated Datadog CRDs. diff --git a/charts/datadog/Chart.yaml b/charts/datadog/Chart.yaml index 5fbbc2d069..c41acbad2d 100644 --- a/charts/datadog/Chart.yaml +++ b/charts/datadog/Chart.yaml @@ -1,7 +1,7 @@ --- apiVersion: v1 name: datadog -version: 3.241.0 +version: 3.241.1 appVersion: "7" description: Datadog Agent keywords: diff --git a/charts/datadog/README.md b/charts/datadog/README.md index dbfa02908d..ad87f1c7e4 100644 --- a/charts/datadog/README.md +++ b/charts/datadog/README.md @@ -1,6 +1,6 @@ # Datadog -![Version: 3.241.0](https://img.shields.io/badge/Version-3.241.0-informational?style=flat-square) ![AppVersion: 7](https://img.shields.io/badge/AppVersion-7-informational?style=flat-square) +![Version: 3.241.1](https://img.shields.io/badge/Version-3.241.1-informational?style=flat-square) ![AppVersion: 7](https://img.shields.io/badge/AppVersion-7-informational?style=flat-square) > [!WARNING] > The Datadog Operator is now enabled by default since version [3.157.0](https://github.com/DataDog/helm-charts/blob/main/charts/datadog/CHANGELOG.md#31570) to collect chart metadata for display in [Fleet Automation](https://docs.datadoghq.com/agent/fleet_automation/). We are aware of issues affecting some environments and are actively working on fixes. We apologize for the inconvenience and appreciate your patience while we address these issues.