Merge pull request #288 from Akrog/fix-api-logfile

Fix api log file increases indefinitely
openstack-k8s-operators · Jun 27, 2024 · fa69b45 · fa69b45
2 parents 5b0101e + fc1f9c0
commit fa69b45
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/pkg/manilaapi/statefulset.go b/pkg/manilaapi/statefulset.go
@@ -128,10 +128,9 @@ func StatefulSet(
 							Args: []string{
 								"--single-child",
 								"--",
-								"/usr/bin/tail",
-								"-n+1",
-								"-F",
-								LogFile,
+								"/bin/sh",
+								"-c",
+								"/usr/bin/tail -n+1 -F " + LogFile + " 2>/dev/null",
 							},
 							Image: instance.Spec.ContainerImage,
 							SecurityContext: &corev1.SecurityContext{

diff --git a/templates/manilaapi/config/01-config.conf b/templates/manilaapi/config/01-config.conf
@@ -1,2 +1,5 @@
 [DEFAULT]
 log_file = {{ .LogFile }}
+log_rotation_type = size
+max_logfile_count = 1
+max_logfile_size_mb = 20
diff --git a/test/kuttl/tests/manila-tls/03-assert.yaml b/test/kuttl/tests/manila-tls/03-assert.yaml
@@ -253,10 +253,9 @@ spec:
       - args:
         - --single-child
         - --
-        - /usr/bin/tail
-        - -n+1
-        - -F
-        - /var/log/manila/manila-api.log
+        - /bin/sh
+        - -c
+        - /usr/bin/tail -n+1 -F /var/log/manila/manila-api.log 2>/dev/null
         volumeMounts:
         - name: logs
           mountPath: /var/log/manila