Merge pull request #376 from fmount/dumb-init

Move -log sidecar container to dumb-init
openstack-k8s-operators · Dec 1, 2023 · 1cede1d · 1cede1d
2 parents 120de04 + 0860fe3
commit 1cede1d
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 11 deletions.
diff --git a/pkg/glanceapi/statefulset.go b/pkg/glanceapi/statefulset.go
@@ -177,9 +177,16 @@ func StatefulSet(
 						{
 							Name: glance.ServiceName + "-log",
 							Command: []string{
-								"/bin/bash",
+								"/usr/bin/dumb-init",
+							},
+							Args: []string{
+								"--single-child",
+								"--",
+								"/usr/bin/tail",
+								"-n+1",
+								"-F",
+								string(glance.GlanceLogPath + instance.Name + ".log"),
 							},
-							Args:  []string{"-c", "tail -n+1 -F " + glance.GlanceLogPath + instance.Name + ".log"},
 							Image: instance.Spec.ContainerImage,
 							SecurityContext: &corev1.SecurityContext{
 								RunAsUser: &runAsUser,

diff --git a/test/kuttl/tests/glance_scale/01-assert.yaml b/test/kuttl/tests/glance_scale/01-assert.yaml
@@ -77,10 +77,14 @@ spec:
     spec:
       containers:
       - args:
-        - -c
-        - tail -n+1 -F /var/log/glance/glance-external.log
+        - --single-child
+        - --
+        - /usr/bin/tail
+        - -n+1
+        - -F
+        - /var/log/glance/glance-external.log
         command:
-        - /bin/bash
+        - /usr/bin/dumb-init
         name: glance-log
       - args:
         - -c
@@ -116,10 +120,14 @@ spec:
     spec:
       containers:
       - args:
-        - -c
-        - tail -n+1 -F /var/log/glance/glance-internal.log
+        - --single-child
+        - --
+        - /usr/bin/tail
+        - -n+1
+        - -F
+        - /var/log/glance/glance-internal.log
         command:
-        - /bin/bash
+        - /usr/bin/dumb-init
         name: glance-log
       - args:
         - -c

diff --git a/test/kuttl/tests/glance_single/01-assert.yaml b/test/kuttl/tests/glance_single/01-assert.yaml
@@ -60,10 +60,14 @@ spec:
     spec:
       containers:
       - args:
-        - -c
-        - tail -n+1 -F /var/log/glance/glance-single.log
+        - --single-child
+        - --
+        - /usr/bin/tail
+        - -n+1
+        - -F
+        - /var/log/glance/glance-single.log
         command:
-        - /bin/bash
+        - /usr/bin/dumb-init
         name: glance-log
       - args:
         - -c