Revert #4431 and #4413 to remove journald mounts from log agent aga…

…in (#4455)
Dynatrace · Feb 12, 2025 · 60dca1b · 60dca1b
1 parent ed279d3
commit 60dca1b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 17 deletions.
diff --git a/pkg/controllers/dynakube/logmonitoring/daemonset/volumes.go b/pkg/controllers/dynakube/logmonitoring/daemonset/volumes.go
@@ -28,8 +28,6 @@ const (
 	dockerLogsVolumePath    = "/var/lib/docker/containers"
 	containerLogsVolumeName = "container-logs"
 	containerLogsVolumePath = "/var/log/containers"
-	journalLogsVolumeName   = "var-log"
-	journalLogsVolumePath   = "/var/log"
 )
 
 // getConfigVolumeMount provides the VolumeMount for the deployment.conf
@@ -105,11 +103,6 @@ func getIngestVolumeMounts() []corev1.VolumeMount {
 			MountPath: containerLogsVolumePath,
 			ReadOnly:  true,
 		},
-		{
-			Name:      journalLogsVolumeName,
-			MountPath: journalLogsVolumePath,
-			ReadOnly:  true,
-		},
 	}
 }
 
@@ -143,15 +136,6 @@ func getIngestVolumes() []corev1.Volume {
 				},
 			},
 		},
-		{
-			Name: journalLogsVolumeName,
-			VolumeSource: corev1.VolumeSource{
-				HostPath: &corev1.HostPathVolumeSource{
-					Path: journalLogsVolumePath,
-					Type: ptr.To(corev1.HostPathDirectory),
-				},
-			},
-		},
 	}
 }
 

diff --git a/pkg/controllers/dynakube/logmonitoring/daemonset/volumes_test.go b/pkg/controllers/dynakube/logmonitoring/daemonset/volumes_test.go
@@ -8,7 +8,7 @@ import (
 )
 
 const (
-	expectedMountLen     = 7
+	expectedMountLen     = 6
 	expectedInitMountLen = 2
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,7 @@ import ( @@
     )
     const (
-    	expectedMountLen     = 7
+    	expectedMountLen     = 6
     	expectedInitMountLen = 2
     )
@@ Expand Down @@