Upgrade to Go 1.12 (#630)

This commit is contained in:
Sargun Dhillon
2019-05-20 03:39:47 -07:00
committed by Pires
parent d0c0d90451
commit d183dbbe17
8 changed files with 14 additions and 9 deletions

View File

@@ -2,7 +2,7 @@ version: 2
jobs: jobs:
validate: validate:
docker: docker:
- image: circleci/golang:1.10 - image: circleci/golang:1.12
working_directory: /go/src/github.com/virtual-kubelet/virtual-kubelet working_directory: /go/src/github.com/virtual-kubelet/virtual-kubelet
steps: steps:
- checkout - checkout
@@ -21,7 +21,7 @@ jobs:
test: test:
docker: docker:
- image: circleci/golang:1.10 - image: circleci/golang:1.12
working_directory: /go/src/github.com/virtual-kubelet/virtual-kubelet working_directory: /go/src/github.com/virtual-kubelet/virtual-kubelet
steps: steps:
- checkout - checkout
@@ -102,6 +102,11 @@ jobs:
- run: - run:
name: Run the end-to-end test suite name: Run the end-to-end test suite
command: | command: |
mkdir $HOME/.go
export PATH=$HOME/.go/bin:${PATH}
curl -fsSL -o "/tmp/go.tar.gz" "https://dl.google.com/go/go1.12.5.linux-amd64.tar.gz"
tar -C $HOME/.go --strip-components=1 -xzf "/tmp/go.tar.gz"
go version
make e2e make e2e
- run: - run:
name: Collect logs on failure from vkubelet-mock-0 name: Collect logs on failure from vkubelet-mock-0

View File

@@ -11,7 +11,7 @@ include Makefile.e2e
# Also, we will want to lock our tool versions using go mod: # Also, we will want to lock our tool versions using go mod:
# https://github.com/golang/go/wiki/Modules#how-can-i-track-tool-dependencies-for-a-module # https://github.com/golang/go/wiki/Modules#how-can-i-track-tool-dependencies-for-a-module
gobin_tool ?= $(shell which gobin || echo $(GOPATH)/bin/gobin) gobin_tool ?= $(shell which gobin || echo $(GOPATH)/bin/gobin)
goimports := golang.org/x/tools/cmd/goimports@release-branch.go1.10 goimports := golang.org/x/tools/cmd/goimports@release-branch.go1.12
gocovmerge := github.com/wadey/gocovmerge@b5bfa59ec0adc420475f97f89b58045c721d761c gocovmerge := github.com/wadey/gocovmerge@b5bfa59ec0adc420475f97f89b58045c721d761c
goreleaser := github.com/goreleaser/goreleaser@v0.82.2 goreleaser := github.com/goreleaser/goreleaser@v0.82.2
gox := github.com/mitchellh/gox@v1.0.1 gox := github.com/mitchellh/gox@v1.0.1

View File

@@ -41,7 +41,7 @@ var (
func setupTracing(ctx context.Context, c Opts) error { func setupTracing(ctx context.Context, c Opts) error {
for k := range c.TraceConfig.Tags { for k := range c.TraceConfig.Tags {
if reservedTagNames[k] { if reservedTagNames[k] {
return strongerrors.InvalidArgument(errors.Errorf("invalid trace tag %q, must not use a reserved tag key")) return strongerrors.InvalidArgument(errors.Errorf("invalid trace tag %q, must not use a reserved tag key", k))
} }
} }
if c.TraceConfig.Tags == nil { if c.TraceConfig.Tags == nil {

View File

@@ -1,7 +1,7 @@
package manager package manager
import ( import (
"k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
corev1listers "k8s.io/client-go/listers/core/v1" corev1listers "k8s.io/client-go/listers/core/v1"

View File

@@ -3,7 +3,7 @@ package manager_test
import ( import (
"testing" "testing"
"k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/errors"
corev1listers "k8s.io/client-go/listers/core/v1" corev1listers "k8s.io/client-go/listers/core/v1"
"k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/cache"

View File

@@ -7,7 +7,7 @@ import (
"net/http/httptest" "net/http/httptest"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
) )
// CCIMock implements a CCI service mock server. // CCIMock implements a CCI service mock server.

View File

@@ -7,7 +7,7 @@ import (
"os" "os"
"testing" "testing"
"k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
"github.com/virtual-kubelet/virtual-kubelet/test/e2e/framework" "github.com/virtual-kubelet/virtual-kubelet/test/e2e/framework"
) )

View File

@@ -9,7 +9,7 @@ import (
"gotest.tools/assert" "gotest.tools/assert"
is "gotest.tools/assert/cmp" is "gotest.tools/assert/cmp"
"k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/fields"
watchapi "k8s.io/apimachinery/pkg/watch" watchapi "k8s.io/apimachinery/pkg/watch"