Do not call "bash -c" unnecessarily as entry points

Closes: OSPRH-680
openstack-k8s-operators · Mar 14, 2024 · 2373da2 · 2373da2
1 parent d7d87d3
commit 2373da2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/pkg/ovncontroller/daemonset.go b/pkg/ovncontroller/daemonset.go
@@ -131,14 +131,11 @@ func DaemonSet(
 	}
 
 	ovnControllerCmd = []string{
-		"/bin/bash", "-c",
+		"/usr/local/bin/container-scripts/net_setup.sh && ovn-controller",
 	}
 	ovnControllerArgs = []string{
 		strings.Join(
-			append(
-				[]string{"/usr/local/bin/container-scripts/net_setup.sh && ovn-controller"},
-				append(ovnControllerTLSArgs, "--pidfile", "unix:/run/openvswitch/db.sock")...,
-			),
+			append(ovnControllerTLSArgs, "--pidfile", "unix:/run/openvswitch/db.sock")...,
 			" ",
 		),
 	}

diff --git a/pkg/ovndbcluster/statefulset.go b/pkg/ovndbcluster/statefulset.go
@@ -58,7 +58,7 @@ func StatefulSet(
 	var preStopCmd []string
 	var postStartCmd []string
 	cmd := []string{"/usr/bin/dumb-init"}
-	args := []string{"--single-child", "--", "/bin/bash", "-c", ServiceCommand}
+	args := []string{"--single-child", "--", ServiceCommand}
 	//
 	// https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/
 	//