diff --git a/Makefile b/Makefile index fc8c34f0fb..96eddfd9ed 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/build/go-in-docker.sh b/build/go-in-docker.sh index cf4c21ecbe..64b002cdc7 100755 --- a/build/go-in-docker.sh +++ b/build/go-in-docker.sh @@ -40,7 +40,7 @@ if [ "$missing" = true ];then exit 1 fi -E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v01092019-b433108ea +E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v02132019-7dc17a603 DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/images/e2e/Dockerfile b/images/e2e/Dockerfile index 13accbf592..8501d20a0d 100644 --- a/images/e2e/Dockerfile +++ b/images/e2e/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM quay.io/kubernetes-ingress-controller/nginx-amd64:0.75 +FROM quay.io/kubernetes-ingress-controller/nginx-amd64:0.76 RUN clean-install \ g++ \ @@ -25,9 +25,9 @@ RUN clean-install \ python \ pkg-config -ENV GOLANG_VERSION 1.11.4 +ENV GOLANG_VERSION 1.11.5 ENV GO_ARCH linux-amd64 -ENV GOLANG_SHA fb26c30e6a04ad937bbc657a1b5bba92f80096af1e8ee6da6430c045a8db3a5b +ENV GOLANG_SHA ff54aafedff961eb94792487e827515da683d61a5f9482f668008832631e5d25 RUN set -eux; \ url="https://golang.org/dl/go${GOLANG_VERSION}.${GO_ARCH}.tar.gz"; \ @@ -62,5 +62,5 @@ RUN luarocks install luacheck \ RUN go get github.com/onsi/ginkgo/ginkgo \ && go get golang.org/x/lint/golint -RUN curl -Lo /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.12.4/bin/linux/amd64/kubectl \ +RUN curl -Lo /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.13.3/bin/linux/amd64/kubectl \ && chmod +x /usr/local/bin/kubectl diff --git a/internal/ingress/controller/util.go b/internal/ingress/controller/util.go index 253989708c..de9405cb4e 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 23438b42b1..d6d522fb24 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