Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update go to 1.11 #2988

Merged
merged 2 commits into from
Aug 25, 2018
Merged

Update go to 1.11 #2988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd9d2aa
Update go to 1.11
aledbf Aug 25, 2018
db947e3
Fix formatting args
aledbf Aug 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/go-in-docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:-""}

Expand Down
4 changes: 2 additions & 2 deletions images/e2e/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"; \
Expand Down
2 changes: 1 addition & 1 deletion internal/ingress/controller/nginx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion internal/ingress/errors/errors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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...)
}