Skip to content

Commit a5d83e0

Browse files
authored
[EBPF-998] gpum: fix system-probe mounts (#2248)
Fix mounts Update baselines docs Merge branch 'main' into guillermo.julian/fix-gpum-mounts Co-authored-by: guillermo.julian <[email protected]>
1 parent a531e51 commit a5d83e0

File tree

7 files changed

+24
-14
lines changed

7 files changed

+24
-14
lines changed

charts/datadog/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Datadog changelog
22

3+
## 3.156.3
4+
5+
* Fix mounts of `/host/run/systemd` and pod-resources socket in system-probe container when GPU monitoring.
6+
37
## 3.156.2
48

59
* Add `ftruncate` and `ftruncate64` syscalls to system-probe seccomp profile when GPU monitoring is enabled and `datadog.gpuMonitoring.configureCgroupPerms` is set to `true`.

charts/datadog/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
apiVersion: v1
33
name: datadog
4-
version: 3.156.2
4+
version: 3.156.3
55
appVersion: "7"
66
description: Datadog Agent
77
keywords:

charts/datadog/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Datadog
22

3-
![Version: 3.156.2](https://img.shields.io/badge/Version-3.156.2-informational?style=flat-square) ![AppVersion: 7](https://img.shields.io/badge/AppVersion-7-informational?style=flat-square)
3+
![Version: 3.156.3](https://img.shields.io/badge/Version-3.156.3-informational?style=flat-square) ![AppVersion: 7](https://img.shields.io/badge/AppVersion-7-informational?style=flat-square)
44

55
[Datadog](https://www.datadoghq.com/) is a hosted infrastructure monitoring platform. This chart adds the Datadog Agent to all nodes in your cluster via a DaemonSet. It also optionally depends on the [kube-state-metrics chart](https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-state-metrics). For more information about monitoring Kubernetes with Datadog, please refer to the [Datadog documentation website](https://docs.datadoghq.com/agent/basic_agent_usage/kubernetes/).
66

charts/datadog/templates/_container-agent.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -311,11 +311,6 @@
311311
readOnly: false
312312
- name: gpu-devices
313313
mountPath: /var/run/nvidia-container-devices/all
314-
{{- if .Values.datadog.gpuMonitoring.configureCgroupPerms }}
315-
- name: hostrun
316-
mountPath: /host/run
317-
readOnly: false
318-
{{- end }}
319314
{{- end }}
320315
{{- if not .Values.providers.gke.gdc }}
321316
- name: dsdsocket

charts/datadog/templates/_container-system-probe.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,16 @@
120120
readOnly: true
121121
{{- end }}
122122
{{- if and .Values.datadog.gpuMonitoring.enabled .Values.datadog.gpuMonitoring.privilegedMode }}
123+
- name: pod-resources-socket
124+
mountPath: {{ .Values.datadog.kubelet.podResourcesSocketDir }}
125+
readOnly: false
123126
- name: gpu-devices
124127
mountPath: /var/run/nvidia-container-devices/all
128+
{{- if .Values.datadog.gpuMonitoring.configureCgroupPerms }}
129+
- name: host-systemd-transient
130+
mountPath: /host/root/run/systemd/transient
131+
readOnly: false
132+
{{- end }}
125133
{{- end }}
126134
{{- if and (eq (include "runtime-compilation-enabled" .) "true") .Values.datadog.systemProbe.enableDefaultKernelHeadersPaths }}
127135
- name: modules

charts/datadog/templates/_daemonset-volumes-linux.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
hostPath:
1616
path: {{ .Values.datadog.kubelet.podResourcesSocketDir }}
1717
{{- if .Values.datadog.gpuMonitoring.configureCgroupPerms }}
18-
- name: hostrun
18+
- name: host-systemd-transient
1919
hostPath:
20-
path: /run
20+
path: /run/systemd/transient
2121
{{- end }}
2222
{{- end }}
2323
{{- if not .Values.providers.gke.gdc }}

test/datadog/baseline/manifests/gpu_monitoring.yaml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1266,9 +1266,6 @@ spec:
12661266
readOnly: false
12671267
- mountPath: /var/run/nvidia-container-devices/all
12681268
name: gpu-devices
1269-
- mountPath: /host/run
1270-
name: hostrun
1271-
readOnly: false
12721269
- mountPath: /var/run/datadog
12731270
name: dsdsocket
12741271
readOnly: false
@@ -1508,8 +1505,14 @@ spec:
15081505
mountPropagation: None
15091506
name: hostroot
15101507
readOnly: true
1508+
- mountPath: /var/lib/kubelet/pod-resources
1509+
name: pod-resources-socket
1510+
readOnly: false
15111511
- mountPath: /var/run/nvidia-container-devices/all
15121512
name: gpu-devices
1513+
- mountPath: /host/root/run/systemd/transient
1514+
name: host-systemd-transient
1515+
readOnly: false
15131516
hostPID: true
15141517
initContainers:
15151518
- args:
@@ -1620,8 +1623,8 @@ spec:
16201623
path: /var/lib/kubelet/pod-resources
16211624
name: pod-resources-socket
16221625
- hostPath:
1623-
path: /run
1624-
name: hostrun
1626+
path: /run/systemd/transient
1627+
name: host-systemd-transient
16251628
- hostPath:
16261629
path: /proc
16271630
name: procdir

0 commit comments

Comments
 (0)