Cleanup: Use get-agent-version for semverCompare

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.

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:

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.

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

charts/datadog/templates/datadog-yaml-configmap.yaml

@@ -32,17 +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 }}
-    # 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 }}

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) -}}