diff --git a/.travis.yml b/.travis.yml index 86579a33..a7d146a5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ branches: language: go go: - - 1.11.6 + - 1.12.x env: - KUBECONFIG=${HOME}/.kube/config PATH=$HOME/k8scli:$HOME/tool:$HOME/google-cloud-sdk/bin:${PATH} GO111MODULE=on DOCKER_CACHE_DIR=${HOME}/docker/ diff --git a/cmd/builder/Dockerfile.fission-builder b/cmd/builder/Dockerfile.fission-builder index fb9afc4c..e57ff1c8 100644 --- a/cmd/builder/Dockerfile.fission-builder +++ b/cmd/builder/Dockerfile.fission-builder @@ -1,7 +1,7 @@ FROM alpine:3.10 as base RUN apk add --update ca-certificates -FROM golang:1.11-alpine as fission-builder +FROM golang:1.12-alpine as fission-builder RUN apk add bash ca-certificates git gcc g++ libc-dev ARG GOPKG=github.com/fission/fission diff --git a/cmd/fetcher/Dockerfile.fission-fetcher b/cmd/fetcher/Dockerfile.fission-fetcher index d1e62967..6ac5a87f 100644 --- a/cmd/fetcher/Dockerfile.fission-fetcher +++ b/cmd/fetcher/Dockerfile.fission-fetcher @@ -1,7 +1,7 @@ FROM alpine:3.10 as base RUN apk add --update ca-certificates -FROM golang:1.11-alpine as builder +FROM golang:1.12-alpine as builder RUN apk add bash ca-certificates git gcc g++ libc-dev ARG GOPKG=github.com/fission/fission diff --git a/cmd/fission-bundle/Dockerfile.fission-bundle b/cmd/fission-bundle/Dockerfile.fission-bundle index ab928a94..66cebab4 100644 --- a/cmd/fission-bundle/Dockerfile.fission-bundle +++ b/cmd/fission-bundle/Dockerfile.fission-bundle @@ -1,7 +1,7 @@ FROM alpine:3.10 as base RUN apk add --update ca-certificates -FROM golang:1.11-alpine as builder +FROM golang:1.12-alpine as builder RUN apk add bash ca-certificates git gcc g++ libc-dev ARG GOPKG=github.com/fission/fission diff --git a/hack/verify-govet.sh b/hack/verify-govet.sh index 1bc47deb..eef824d5 100755 --- a/hack/verify-govet.sh +++ b/hack/verify-govet.sh @@ -4,12 +4,4 @@ set -o errexit set -o nounset set -o pipefail -find_files() { - find . -not \( \ - \( \ - -wholename '*/vendor/*' \ - \) -prune \ - \) -name '*.go' -} - -find_files | xargs -I@ bash -c "go tool vet @" +go vet -v $(go list ./...| grep -v vendor) diff --git a/pkg/executor/executor.go b/pkg/executor/executor.go index d0663756..815297ec 100644 --- a/pkg/executor/executor.go +++ b/pkg/executor/executor.go @@ -128,9 +128,7 @@ func (executor *Executor) serveCreateFuncServices() { // It normally happened if there are multiple requests are // waiting for the same function and executor failed to cre- // ate service for function. - err = errors.Wrapf(err, "error getting service for function", - zap.String("function_name", m.Name), - zap.String("function_namespace", m.Namespace)) + err = errors.Wrapf(err, "error getting service for function %v in namespace %v", m.Name, m.Namespace) req.respChan <- &createFuncServiceResponse{ funcSvc: fsvc, err: err,