diff --git a/Makefile b/Makefile index fc8c34f0f..96eddfd9e 100644 --- a/Makefile +++ b/Makefile @@ -61,7 +61,7 @@ IMAGE = $(REGISTRY)/$(IMGNAME) MULTI_ARCH_IMG = $(IMAGE)-$(ARCH) # Set default base image dynamically for each arch -BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):0.75 +BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):0.76 ifeq ($(ARCH),arm64) QEMUARCH=aarch64 diff --git a/internal/ingress/controller/util.go b/internal/ingress/controller/util.go index 253989708..de9405cb4 100644 --- a/internal/ingress/controller/util.go +++ b/internal/ingress/controller/util.go @@ -17,11 +17,12 @@ limitations under the License. package controller import ( - "k8s.io/apimachinery/pkg/util/intstr" "os" "os/exec" "syscall" + "k8s.io/apimachinery/pkg/util/intstr" + "fmt" "k8s.io/klog" @@ -108,10 +109,5 @@ func nginxExecCommand(args ...string) *exec.Cmd { } func nginxTestCommand(cfg string) *exec.Cmd { - ngx := os.Getenv("NGINX_BINARY") - if ngx == "" { - ngx = defBinary - } - - return exec.Command("authbind", "--deep", ngx, "-c", cfg, "-t") + return exec.Command(defBinary, "-c", cfg, "-t") } diff --git a/rootfs/Dockerfile b/rootfs/Dockerfile index 23438b42b..d6d522fb2 100644 --- a/rootfs/Dockerfile +++ b/rootfs/Dockerfile @@ -42,6 +42,9 @@ RUN bash -eu -c ' \ RUN setcap cap_net_bind_service=+ep /nginx-ingress-controller \ && setcap -v cap_net_bind_service=+ep /nginx-ingress-controller +RUN setcap cap_net_bind_service=+ep /usr/sbin/nginx \ + && setcap -v cap_net_bind_service=+ep /usr/sbin/nginx + # Create symlinks to redirect nginx logs to stdout and stderr docker log collector # This only works if nginx is started with CMD or ENTRYPOINT RUN ln -sf /dev/stdout /var/log/nginx/access.log