Merge pull request #2043 from volleynator/master

feat: add parameter to disable mount of /var/log directory

Author: csatib02

charts/logging-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_fluentbitagents.yaml

@@ -1142,6 +1142,8 @@ spec:
                 type: boolean
               disableVarLibDockerContainers:
                 type: boolean
+              disableVarLog:
+                type: boolean
               dnsConfig:
                 properties:
                   nameservers:

charts/logging-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_loggings.yaml

@@ -1998,6 +1998,8 @@ spec:
                     type: boolean
                   disableVarLibDockerContainers:
                     type: boolean
+                  disableVarLog:
+                    type: boolean
                   dnsConfig:
                     properties:
                       nameservers:

charts/logging-operator/crds/logging.banzaicloud.io_fluentbitagents.yaml

@@ -1139,6 +1139,8 @@ spec:
                 type: boolean
               disableVarLibDockerContainers:
                 type: boolean
+              disableVarLog:
+                type: boolean
               dnsConfig:
                 properties:
                   nameservers:

charts/logging-operator/crds/logging.banzaicloud.io_loggings.yaml

@@ -1995,6 +1995,8 @@ spec:
                     type: boolean
                   disableVarLibDockerContainers:
                     type: boolean
+                  disableVarLog:
+                    type: boolean
                   dnsConfig:
                     properties:
                       nameservers:

config/crd/bases/logging.banzaicloud.io_fluentbitagents.yaml

@@ -1139,6 +1139,8 @@ spec:
                 type: boolean
               disableVarLibDockerContainers:
                 type: boolean
+              disableVarLog:
+                type: boolean
               dnsConfig:
                 properties:
                   nameservers:

config/crd/bases/logging.banzaicloud.io_loggings.yaml

@@ -1995,6 +1995,8 @@ spec:
                     type: boolean
                   disableVarLibDockerContainers:
                     type: boolean
+                  disableVarLog:
+                    type: boolean
                   dnsConfig:
                     properties:
                       nameservers:

docs/configuration/crds/v1beta1/fluentbit_types.md

@@ -104,6 +104,11 @@ Disable Kubernetes metadata filter
 DisableVarLibDockerContainers controls whether the /var/lib/docker/containers volume is mounted. If true, the volume is NOT mounted. If false (default), the volume is mounted. 
 
 
+### disableVarLog (*bool, optional) {#fluentbitspec-disablevarlog}
+
+DisableVarLog controls whether the /var/log volume is mounted. If true, the volume is NOT mounted. If false (default), the volume is mounted. 
+
+
 ### enableUpstream (bool, optional) {#fluentbitspec-enableupstream}
 
 

pkg/resources/fluentbit/daemonset.go

@@ -175,17 +175,20 @@ func newConfigMapReloader(spec *v1beta1.FluentbitSpec) corev1.Container {
 
 func (r *Reconciler) generateVolumeMounts() (v []corev1.VolumeMount) {
 	v = []corev1.VolumeMount{
-		{
-			Name:      "varlogs",
-			ReadOnly:  true,
-			MountPath: "/var/log/",
-		},
 		{
 			Name:      "config",
 			MountPath: OperatorConfigPath,
 		},
 	}
 
+	if !*r.fluentbitSpec.DisableVarLog {
+		v = append(v, corev1.VolumeMount{
+			Name:      "varlogs",
+			ReadOnly:  true,
+			MountPath: "/var/log/",
+		})
+	}
+
 	if !*r.fluentbitSpec.DisableVarLibDockerContainers {
 		v = append(v, corev1.VolumeMount{
 			Name:      "varlibcontainers",

pkg/sdk/logging/api/v1beta1/fluentbit_types.go

@@ -80,6 +80,9 @@ type FluentbitSpec struct {
 	// DisableVarLibDockerContainers controls whether the /var/lib/docker/containers volume is mounted.
 	// If true, the volume is NOT mounted. If false (default), the volume is mounted.
 	DisableVarLibDockerContainers *bool `json:"disableVarLibDockerContainers,omitempty"`
+	// DisableVarLog controls whether the /var/log volume is mounted.
+	// If true, the volume is NOT mounted. If false (default), the volume is mounted.
+	DisableVarLog *bool `json:"disableVarLog,omitempty"`
 	// HotReload pauses all inputs and waits until they finish. In certain situations this is unacceptable, for example if an output is down for a longer time.
 	// An undocumented option called "Hot_Reload.Ensure_Thread_Safety Off" can be used at the [SERVICE] config to force hotreload after the grace period.
 	// Please note that it might result in a SIGSEGV, but worst case kubelet will restart the container.

pkg/sdk/logging/api/v1beta1/logging_types.go

@@ -270,6 +270,10 @@ func FluentBitDefaults(fluentbitSpec *FluentbitSpec) error {
 		if fluentbitSpec.DisableVarLibDockerContainers == nil {
 			fluentbitSpec.DisableVarLibDockerContainers = util.BoolPointer(false)
 		}
+		// Set default value for DisableVarLog to false (meaning volume is mounted by default)
+		if fluentbitSpec.DisableVarLog == nil {
+			fluentbitSpec.DisableVarLog = util.BoolPointer(false)
+		}
 		if fluentbitSpec.PosisionDBLegacy != nil {
 			return errors.New("`position_db` field is deprecated, use `positiondb`")
 		}