Remove default debug value and change container command

Author: bjee19

apis/v1alpha2/nginxproxy_types.go

@@ -438,7 +438,6 @@ type ContainerSpec struct {
 	// Debug enables debugging for NGINX by using the nginx-debug binary.
 	//
 	// +optional
-	// +kubebuilder:default=false
 	Debug *bool `json:"debug,omitempty"`
 
 	// Image is the NGINX image to use.

build/entrypoint.sh

@@ -16,7 +16,13 @@ rm -rf /var/run/nginx/*.sock
 
 # Launch nginx
 echo "starting nginx ..."
-/usr/sbin/nginx -g "daemon off;" &
+
+# if we want to use the nginx-debug binary, we will call this script with an argument "debug"
+if [ "${1:-false}" = "debug" ]; then
+    /usr/sbin/nginx-debug -g "daemon off;" &
+else
+    /usr/sbin/nginx -g "daemon off;" &
+fi
 
 nginx_pid=$!
 
@@ -31,7 +37,7 @@ done
 
 # start nginx-agent, pass args
 echo "starting nginx-agent ..."
-nginx-agent "$@" &
+nginx-agent &
 
 agent_pid=$!
 

config/crd/bases/gateway.nginx.org_nginxproxies.yaml

@@ -80,7 +80,6 @@ spec:
                           container.
                         properties:
                           debug:
-                            default: false
                             description: Debug enables debugging for NGINX by using
                               the nginx-debug binary.
                             type: boolean

deploy/crds.yaml

@@ -665,7 +665,6 @@ spec:
                           container.
                         properties:
                           debug:
-                            default: false
                             description: Debug enables debugging for NGINX by using
                               the nginx-debug binary.
                             type: boolean

internal/mode/static/provisioner/objects.go

@@ -449,8 +449,8 @@ func (p *NginxProvisioner) buildNginxPodTemplateSpec(
 			container.VolumeMounts = append(container.VolumeMounts, containerSpec.VolumeMounts...)
 
 			if containerSpec.Debug != nil && *containerSpec.Debug {
-				container.Command = append(container.Command, "/bin/sh")
-				container.Args = append(container.Args, "-c", "rm -rf /var/run/nginx/*sock && nginx-debug -g 'daemon off;'")
+				container.Command = append(container.Command, "/agent/entrypoint.sh")
+				container.Args = append(container.Args, "debug")
 			}
 			spec.Spec.Containers[0] = container
 		}