DevFW-CICD/ingress-nginx-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3748 from aledbf/update-image

Browse source 
Update nginx image
This commit is contained in:
Kubernetes Prow Robot 2019-02-13 15:14:08 -08:00 committed by GitHub
commit c8d30755a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -61,7 +61,7 @@ IMAGE = $(REGISTRY)/$(IMGNAME)
MULTI_ARCH_IMG = $(IMAGE)-$(ARCH) MULTI_ARCH_IMG = $(IMAGE)-$(ARCH)
# Set default base image dynamically for each 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) ifeq ($(ARCH),arm64)
QEMUARCH=aarch64 QEMUARCH=aarch64

2
build/go-in-docker.sh
View file

@ -40,7 +40,7 @@ if [ "$missing" = true ];then
exit 1 exit 1
fi 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:-""} DOCKER_OPTS=${DOCKER_OPTS:-""}

8
images/e2e/Dockerfile
View file

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # 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 \ RUN clean-install \
g++ \ g++ \
@ -25,9 +25,9 @@ RUN clean-install \
python \ python \
pkg-config pkg-config
ENV GOLANG_VERSION 1.11.4 ENV GOLANG_VERSION 1.11.5
ENV GO_ARCH linux-amd64 ENV GO_ARCH linux-amd64
ENV GOLANG_SHA fb26c30e6a04ad937bbc657a1b5bba92f80096af1e8ee6da6430c045a8db3a5b ENV GOLANG_SHA ff54aafedff961eb94792487e827515da683d61a5f9482f668008832631e5d25
RUN set -eux; \ RUN set -eux; \
url="https://golang.org/dl/go${GOLANG_VERSION}.${GO_ARCH}.tar.gz"; \ 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 \ RUN go get github.com/onsi/ginkgo/ginkgo \
&& go get golang.org/x/lint/golint && 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 && chmod +x /usr/local/bin/kubectl

10
internal/ingress/controller/util.go
View file

@ -17,11 +17,12 @@ limitations under the License.
package controller package controller
import ( import (
"k8s.io/apimachinery/pkg/util/intstr"
"os" "os"
"os/exec" "os/exec"
"syscall" "syscall"
"k8s.io/apimachinery/pkg/util/intstr"
"fmt" "fmt"
"k8s.io/klog" "k8s.io/klog"
@ -108,10 +109,5 @@ func nginxExecCommand(args ...string) *exec.Cmd {
} }
func nginxTestCommand(cfg string) *exec.Cmd { func nginxTestCommand(cfg string) *exec.Cmd {
ngx := os.Getenv("NGINX_BINARY") return exec.Command(defBinary, "-c", cfg, "-t")
if ngx == "" {
ngx = defBinary
}
return exec.Command("authbind", "--deep", ngx, "-c", cfg, "-t")
} }

3
rootfs/Dockerfile
View file

@ -42,6 +42,9 @@ RUN bash -eu -c ' \
RUN setcap cap_net_bind_service=+ep /nginx-ingress-controller \ RUN setcap cap_net_bind_service=+ep /nginx-ingress-controller \
&& setcap -v 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 # Create symlinks to redirect nginx logs to stdout and stderr docker log collector
# This only works if nginx is started with CMD or ENTRYPOINT # This only works if nginx is started with CMD or ENTRYPOINT
RUN ln -sf /dev/stdout /var/log/nginx/access.log RUN ln -sf /dev/stdout /var/log/nginx/access.log