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

Fix api log file increases indefinitely
openstack-k8s-operators · Jun 26, 2024 · 1331701 · 1331701
2 parents e61187e + 07b9e7d
commit 1331701
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/pkg/cinderapi/statefuleset.go b/pkg/cinderapi/statefuleset.go
@@ -136,10 +136,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/cinderapi/config/01-service-defaults.conf b/templates/cinderapi/config/01-service-defaults.conf
@@ -1,5 +1,8 @@
 [DEFAULT]
 log_file = {{ .LogFile }}
+log_rotation_type = size
+max_logfile_count = 1
+max_logfile_size_mb = 20
 
 [oslo_policy]
 enforce_scope = true

diff --git a/test/kuttl/common/assert_sample_deployment.yaml b/test/kuttl/common/assert_sample_deployment.yaml
@@ -61,10 +61,9 @@ spec:
       - args:
         - --single-child
         - --
-        - /usr/bin/tail
-        - -n+1
-        - -F
-        - /var/log/cinder/cinder-api.log
+        - /bin/sh
+        - -c
+        - /usr/bin/tail -n+1 -F /var/log/cinder/cinder-api.log 2>/dev/null
         command:
         - /usr/bin/dumb-init
         imagePullPolicy: IfNotPresent

diff --git a/test/kuttl/common/assert_tls_sample_deployment.yaml b/test/kuttl/common/assert_tls_sample_deployment.yaml
@@ -60,10 +60,9 @@ spec:
       - args:
         - --single-child
         - --
-        - /usr/bin/tail
-        - -n+1
-        - -F
-        - /var/log/cinder/cinder-api.log
+        - /bin/sh
+        - -c
+        - /usr/bin/tail -n+1 -F /var/log/cinder/cinder-api.log 2>/dev/null
         volumeMounts:
         - mountPath: /var/log/cinder
           name: logs