Merge pull request openstack-k8s-operators#310 from fmount/dumb-init

Move -log sidecar container to dumb-init
ASBishop · Dec 14, 2023 · 8a4acd3 · 8a4acd3
2 parents a3f1200 + e109a39
commit 8a4acd3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/pkg/cinderapi/deployment.go b/pkg/cinderapi/deployment.go
@@ -104,9 +104,16 @@ func Deployment(
 						{
 							Name: instance.Name + "-log",
 							Command: []string{
-								"/bin/bash",
+								"/usr/bin/dumb-init",
+							},
+							Args: []string{
+								"--single-child",
+								"--",
+								"/usr/bin/tail",
+								"-n+1",
+								"-F",
+								LogFile,
 							},
-							Args:  []string{"-c", "tail -n+1 -F " + LogFile},
 							Image: instance.Spec.ContainerImage,
 							SecurityContext: &corev1.SecurityContext{
 								RunAsUser: &runAsUser,

diff --git a/test/kuttl/common/assert_sample_deployment.yaml b/test/kuttl/common/assert_sample_deployment.yaml
@@ -64,10 +64,14 @@ spec:
             weight: 1
       containers:
       - args:
-        - -c
-        - tail -n+1 -F /var/log/cinder/cinder-api.log
+        - --single-child
+        - --
+        - /usr/bin/tail
+        - -n+1
+        - -F
+        - /var/log/cinder/cinder-api.log
         command:
-        - /bin/bash
+        - /usr/bin/dumb-init
         imagePullPolicy: IfNotPresent
         resources: {}
         securityContext: