[mq] working branch - merge 4b8e87e on top of main at a3e7eab

{"baseBranch":"main","baseCommit":"a3e7eab6a736ad487f6f7be07ec42ae2b766e233","createdAt":"2025-01-10T08:32:16.401259Z","headSha":"4b8e87e84e43cf54a0d9fb033231621e9bdc0afe","id":"6b732ba3-d6b5-4cc1-9df2-3d1d5bfebab7","priority":"200","pullRequestNumber":"1610","queuedAt":"2025-01-10T08:32:16.400503Z","status":"STATUS_QUEUED"}
DataDog · Jan 10, 2025 · 56ff455 · 56ff455
2 parents a0330d9 + 4b8e87e
commit 56ff455
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/internal/controller/datadogagent/feature/servicediscovery/feature.go b/internal/controller/datadogagent/feature/servicediscovery/feature.go
@@ -71,6 +71,11 @@ func (f *serviceDiscoveryFeature) ManageNodeAgent(managers feature.PodTemplateMa
 	managers.VolumeMount().AddVolumeMountToContainer(&procdirMount, apicommon.SystemProbeContainerName)
 	managers.Volume().AddVolume(&procdirVol)
 
+	// Needed to resolve container information
+	cgroupsVol, cgroupsMount := volume.GetVolumes(v2alpha1.CgroupsVolumeName, v2alpha1.CgroupsHostPath, v2alpha1.CgroupsMountPath, true)
+	managers.VolumeMount().AddVolumeMountToContainer(&cgroupsMount, apicommon.SystemProbeContainerName)
+	managers.Volume().AddVolume(&cgroupsVol)
+
 	socketVol, socketVolMount := volume.GetVolumesEmptyDir(v2alpha1.SystemProbeSocketVolumeName, v2alpha1.SystemProbeSocketVolumePath, false)
 	managers.Volume().AddVolume(&socketVol)
 	managers.VolumeMount().AddVolumeMountToContainer(&socketVolMount, apicommon.SystemProbeContainerName)

diff --git a/internal/controller/datadogagent/feature/servicediscovery/feature_test.go b/internal/controller/datadogagent/feature/servicediscovery/feature_test.go
@@ -63,6 +63,11 @@ func Test_serviceDiscoveryFeature_Configure(t *testing.T) {
 				MountPath: v2alpha1.ProcdirMountPath,
 				ReadOnly:  true,
 			},
+			{
+				Name:      v2alpha1.CgroupsVolumeName,
+				MountPath: v2alpha1.CgroupsMountPath,
+				ReadOnly:  true,
+			},
 			{
 				Name:      v2alpha1.SystemProbeSocketVolumeName,
 				MountPath: v2alpha1.SystemProbeSocketVolumePath,
@@ -86,6 +91,14 @@ func Test_serviceDiscoveryFeature_Configure(t *testing.T) {
 					},
 				},
 			},
+			{
+				Name: v2alpha1.CgroupsVolumeName,
+				VolumeSource: corev1.VolumeSource{
+					HostPath: &corev1.HostPathVolumeSource{
+						Path: v2alpha1.CgroupsHostPath,
+					},
+				},
+			},
 			{
 				Name: v2alpha1.SystemProbeSocketVolumeName,
 				VolumeSource: corev1.VolumeSource{