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

Merge pull request #2988 from aledbf/go-1.11

Browse source 
Update go to 1.11
This commit is contained in:
k8s-ci-robot 2018-08-25 09:16:31 -07:00 committed by GitHub
commit 5e584ab693
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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:v08172018-4c33df1 E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v08252018-3c507e98c
DOCKER_OPTS=${DOCKER_OPTS:-""} DOCKER_OPTS=${DOCKER_OPTS:-""}

4
images/e2e/Dockerfile
View file

@ -25,9 +25,9 @@ RUN clean-install \
python \ python \
pkg-config pkg-config
ENV GOLANG_VERSION 1.10.3 ENV GOLANG_VERSION 1.11
ENV GO_ARCH linux-amd64 ENV GO_ARCH linux-amd64
ENV GOLANG_SHA fa1b0e45d3b647c252f51f5e1204aba049cde4af177ef9f2181f43004f901035 ENV GOLANG_SHA b3fcf280ff86558e0559e185b601c9eade0fd24c900b4c63cd14d1d38613e499
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"; \

2
internal/ingress/controller/nginx.go
View file

@ -195,7 +195,7 @@ Error loading new template: %v
for _, f := range filesToWatch { for _, f := range filesToWatch {
_, err = watch.NewFileWatcher(f, func() { _, 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")) n.syncQueue.EnqueueTask(task.GetDummyObject("file-change"))
}) })
if err != nil { if err != nil {

2
internal/ingress/errors/errors.go
View file

@ -92,5 +92,5 @@ func New(m string) error {
// Errorf formats according to a format specifier and returns the string // Errorf formats according to a format specifier and returns the string
// as a value that satisfies error. // as a value that satisfies error.
func Errorf(format string, args ...interface{}) error { func Errorf(format string, args ...interface{}) error {
return errors.Errorf(format, args) return errors.Errorf(format, args...)
} }