Merge branch 'main' into fanny/autopilot-disallow-sbom

DataDog · Jan 10, 2025 · 5e6fdde · 5e6fdde
2 parents 24a997f + 788d28d
commit 5e6fdde
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/charts/datadog/CHANGELOG.md b/charts/datadog/CHANGELOG.md
@@ -1,9 +1,13 @@
 # Datadog changelog
 
-## 3.87.2
+## 3.87.3
 
 * Disable SBOM monitoring features for GKE Autopilot, as they are not supported
 
+## 3.87.2
+
+* Add cgroups mount in system-probe for USM, NPM and Service Discovery matching the datadog-operator.
+
 ## 3.87.1
 
 * Add the ability to set the image tag to use for the APM Injector.

diff --git a/charts/datadog/templates/_container-system-probe.yaml b/charts/datadog/templates/_container-system-probe.yaml
@@ -70,6 +70,12 @@
       mountPath: /host/proc
       mountPropagation: {{ .Values.datadog.hostVolumeMountPropagation }}
       readOnly: true
+{{- if or .Values.datadog.serviceMonitoring.enabled .Values.datadog.networkMonitoring.enabled .Values.datadog.discovery.enabled }}
+    - name: cgroups
+      mountPath: /host/sys/fs/cgroup
+      mountPropagation: {{ .Values.datadog.hostVolumeMountPropagation }}
+      readOnly: true
+{{- end }}
     {{- include "linux-container-host-release-volumemounts" . | nindent 4 }}
     {{- if (eq (include "should-add-host-path-for-os-release-paths" .) "true") }}
     {{- if ne .Values.datadog.osReleasePath "/etc/redhat-release" }}