diff --git a/build/go-in-docker.sh b/build/go-in-docker.sh index 50db9a3687..2a325a37e6 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:v08172018-4c33df1 +E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v08252018-3c507e98c DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/images/e2e/Dockerfile b/images/e2e/Dockerfile index 70d9f1e978..20f789a383 100644 --- a/images/e2e/Dockerfile +++ b/images/e2e/Dockerfile @@ -25,9 +25,9 @@ RUN clean-install \ python \ pkg-config -ENV GOLANG_VERSION 1.10.3 +ENV GOLANG_VERSION 1.11 ENV GO_ARCH linux-amd64 -ENV GOLANG_SHA fa1b0e45d3b647c252f51f5e1204aba049cde4af177ef9f2181f43004f901035 +ENV GOLANG_SHA b3fcf280ff86558e0559e185b601c9eade0fd24c900b4c63cd14d1d38613e499 RUN set -eux; \ url="https://golang.org/dl/go${GOLANG_VERSION}.${GO_ARCH}.tar.gz"; \ diff --git a/internal/ingress/controller/nginx.go b/internal/ingress/controller/nginx.go index 22ad3d8e77..e75701522c 100644 --- a/internal/ingress/controller/nginx.go +++ b/internal/ingress/controller/nginx.go @@ -195,7 +195,7 @@ Error loading new template: %v for _, f := range filesToWatch { _, err = watch.NewFileWatcher(f, func() { - glog.Info("File %v changed. Reloading NGINX", f) + glog.Infof("File %v changed. Reloading NGINX", f) n.syncQueue.EnqueueTask(task.GetDummyObject("file-change")) }) if err != nil { diff --git a/internal/ingress/errors/errors.go b/internal/ingress/errors/errors.go index 03e19db6fb..b58c83fbbb 100644 --- a/internal/ingress/errors/errors.go +++ b/internal/ingress/errors/errors.go @@ -92,5 +92,5 @@ func New(m string) error { // Errorf formats according to a format specifier and returns the string // as a value that satisfies error. func Errorf(format string, args ...interface{}) error { - return errors.Errorf(format, args) + return errors.Errorf(format, args...) }