Remove pod container Command for route agent and gateway

...since the associated Docker files specify an ENTRYPOINT. This addresses a FIXME. Signed-off-by: Tom Pantelis <[email protected]>
submariner-io · Jul 26, 2024 · f9f4c99 · f9f4c99
1 parent e0ca350
commit f9f4c99
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 5 deletions.
diff --git a/controllers/submariner/gateway_resources.go b/controllers/submariner/gateway_resources.go
@@ -154,7 +154,6 @@ func newGatewayPodTemplate(cr *v1alpha1.Submariner, name string, podSelectorLabe
 					Name:            name,
 					Image:           getImagePath(cr, opnames.GatewayImage, names.GatewayComponent),
 					ImagePullPolicy: images.GetPullPolicy(cr.Spec.Version, cr.Spec.ImageOverrides[names.GatewayComponent]),
-					Command:         []string{"submariner.sh"},
 					SecurityContext: &corev1.SecurityContext{
 						Capabilities: &corev1.Capabilities{
 							Add:  []corev1.Capability{"net_admin"},

diff --git a/controllers/submariner/route_agent_resources.go b/controllers/submariner/route_agent_resources.go
@@ -126,8 +126,6 @@ func newRouteAgentDaemonSet(cr *v1alpha1.Submariner, name string) *appsv1.Daemon
 							Name:            name,
 							Image:           getImagePath(cr, opnames.RouteAgentImage, names.RouteAgentComponent),
 							ImagePullPolicy: images.GetPullPolicy(cr.Spec.Version, cr.Spec.ImageOverrides[names.RouteAgentComponent]),
-							// FIXME: Should be entrypoint script, find/use correct file for routeagent
-							Command: []string{"submariner-route-agent.sh"},
 							SecurityContext: &corev1.SecurityContext{
 								Capabilities:             &corev1.Capabilities{Add: []corev1.Capability{"ALL"}},
 								AllowPrivilegeEscalation: ptr.To(true),

diff --git a/scripts/test/system.sh b/scripts/test/system.sh
@@ -258,7 +258,6 @@ function verify_subm_gateway_pod() {
   validate_pod_container_equals 'securityContext.privileged' 'true'
   validate_pod_container_equals 'securityContext.readOnlyRootFilesystem' 'false'
   validate_pod_container_equals 'securityContext.runAsNonRoot' 'false'
-  validate_pod_container_has 'command' 'submariner.sh'
 
   jq -r '.spec.containers[].env' "$json_file"
   validate_pod_container_env 'SUBMARINER_NAMESPACE' "$subm_ns"
@@ -322,7 +321,6 @@ function verify_subm_routeagent_pod() {
     validate_pod_container_equals 'securityContext.privileged' 'true'
     validate_pod_container_equals 'securityContext.readOnlyRootFilesystem' 'false'
     validate_pod_container_equals 'securityContext.runAsNonRoot' 'false'
-    validate_pod_container_has 'command' 'submariner-route-agent.sh'
 
     jq -r '.spec.containers[].env' "$json_file"
     validate_pod_container_env 'SUBMARINER_NAMESPACE' "$subm_ns"