Skip to content

Commit 996cc39

Browse files
authored
Merge pull request #565 from vincepri/k8s-121-go116
⚠ Update Kubernetes 1.21.0 and Go 1.16
2 parents f284e2e + f38cad7 commit 996cc39

File tree

5 files changed

+115
-97
lines changed

5 files changed

+115
-97
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ os:
55
- osx
66

77
go:
8-
- "1.13"
8+
- "1.16"
99

1010
git:
1111
depth: 3
1212

1313
go_import_path: sigs.k8s.io/controller-tools
1414

1515
install:
16-
- curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.23.6
16+
- curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.32.0
1717

1818
script:
1919
- GO111MODULE=on TRACE=1 ./test.sh

go.mod

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11
module sigs.k8s.io/controller-tools
22

3-
go 1.15
3+
go 1.16
44

55
require (
6-
github.com/fatih/color v1.9.0
6+
github.com/fatih/color v1.10.0
77
github.com/gobuffalo/flect v0.2.2
8-
github.com/google/go-cmp v0.5.2
9-
github.com/mattn/go-colorable v0.1.8 // indirect
10-
github.com/onsi/ginkgo v1.14.1
11-
github.com/onsi/gomega v1.10.2
12-
github.com/spf13/cobra v1.1.1
8+
github.com/google/go-cmp v0.5.5
9+
github.com/onsi/ginkgo v1.16.1
10+
github.com/onsi/gomega v1.11.0
11+
github.com/spf13/cobra v1.1.3
1312
github.com/spf13/pflag v1.0.5
14-
golang.org/x/tools v0.0.0-20200616133436-c1934b75d054
15-
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776
16-
k8s.io/api v0.20.2
17-
k8s.io/apiextensions-apiserver v0.20.2
18-
k8s.io/apimachinery v0.20.2
13+
golang.org/x/tools v0.1.1-0.20210427153610-6397a11608ad
14+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
15+
k8s.io/api v0.21.0
16+
k8s.io/apiextensions-apiserver v0.21.0
17+
k8s.io/apimachinery v0.21.0
1918
sigs.k8s.io/yaml v1.2.0
2019
)
2120

0 commit comments

Comments
 (0)