Skip to content

Commit 6dc239a

Browse files
authored
update Go and dependencies (zalando#1645)
* update Go and dependencies * update deps for kubectl-pg too * raise Go version for internal CI pipelines
1 parent e5fcb46 commit 6dc239a

File tree

9 files changed

+449
-296
lines changed

9 files changed

+449
-296
lines changed

.github/workflows/run_e2e.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- uses: actions/checkout@v1
1515
- uses: actions/setup-go@v2
1616
with:
17-
go-version: "^1.15.6"
17+
go-version: "^1.16.9"
1818
- name: Make dependencies
1919
run: make deps mocks
2020
- name: Compile

.github/workflows/run_tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- uses: actions/checkout@v2
1515
- uses: actions/setup-go@v2
1616
with:
17-
go-version: "^1.15.6"
17+
go-version: "^1.16.9"
1818
- name: Make dependencies
1919
run: make deps mocks
2020
- name: Compile

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ mocks:
8585
GO111MODULE=on go generate ./...
8686

8787
tools:
88-
GO111MODULE=on go get k8s.io/client-go@kubernetes-1.20.6
89-
GO111MODULE=on go get github.com/golang/mock/mockgen@v1.4.4
88+
GO111MODULE=on go get k8s.io/client-go@kubernetes-1.22.2
89+
GO111MODULE=on go get github.com/golang/mock/mockgen@v1.6.0
9090
GO111MODULE=on go mod tidy
9191

9292
fmt:

delivery.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pipeline:
1616
- desc: 'Install go'
1717
cmd: |
1818
cd /tmp
19-
wget -q https://storage.googleapis.com/golang/go1.15.6.linux-amd64.tar.gz -O go.tar.gz
19+
wget -q https://storage.googleapis.com/golang/go1.16.9.linux-amd64.tar.gz -O go.tar.gz
2020
tar -xf go.tar.gz
2121
mv go /usr/local
2222
ln -s /usr/local/go/bin/go /usr/bin/go

docs/developer.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ features and tests.
77

88
Postgres Operator is written in Go. Use the [installation instructions](https://golang.org/doc/install#install)
99
if you don't have Go on your system. You won't be able to compile the operator
10-
with Go older than 1.15. We recommend installing [the latest one](https://golang.org/dl/).
10+
with Go older than 1.16. We recommend installing [the latest one](https://golang.org/dl/).
1111

1212
Go projects expect their source code and all the dependencies to be located
1313
under the [GOPATH](https://github.com/golang/go/wiki/GOPATH). Normally, one

go.mod

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11
module github.com/zalando/postgres-operator
22

3-
go 1.15
3+
go 1.16
44

55
require (
6-
github.com/aws/aws-sdk-go v1.36.29
7-
github.com/golang/mock v1.4.4
8-
github.com/lib/pq v1.9.0
6+
github.com/aws/aws-sdk-go v1.41.0
7+
github.com/golang/mock v1.6.0
8+
github.com/lib/pq v1.10.3
99
github.com/motomux/pretty v0.0.0-20161209205251-b2aad2c9a95d
1010
github.com/r3labs/diff v1.1.0
11-
github.com/sirupsen/logrus v1.7.0
12-
github.com/stretchr/testify v1.6.1
13-
golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c
14-
golang.org/x/mod v0.4.0 // indirect
11+
github.com/sirupsen/logrus v1.8.1
12+
github.com/stretchr/testify v1.7.0
13+
golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83
1514
gopkg.in/yaml.v2 v2.4.0
16-
k8s.io/api v0.20.6
17-
k8s.io/apiextensions-apiserver v0.20.6
18-
k8s.io/apimachinery v0.20.6
19-
k8s.io/client-go v0.20.6
20-
k8s.io/code-generator v0.20.6
15+
k8s.io/api v0.22.2
16+
k8s.io/apiextensions-apiserver v0.22.2
17+
k8s.io/apimachinery v0.22.2
18+
k8s.io/client-go v0.22.2
19+
k8s.io/code-generator v0.22.2
2120
)

go.sum

Lines changed: 213 additions & 123 deletions
Large diffs are not rendered by default.

kubectl-pg/go.mod

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
module github.com/zalando/postgres-operator/kubectl-pg
22

3-
go 1.15
3+
go 1.16
44

55
require (
66
github.com/spf13/cobra v1.1.3
77
github.com/spf13/viper v1.7.1
8-
github.com/zalando/postgres-operator v1.6.0
9-
k8s.io/api v0.20.2
10-
k8s.io/apiextensions-apiserver v0.20.2
11-
k8s.io/apimachinery v0.20.2
12-
k8s.io/client-go v0.20.2
13-
k8s.io/klog v1.0.0 // indirect
8+
github.com/zalando/postgres-operator v1.7.0
9+
k8s.io/api v0.22.2
10+
k8s.io/apiextensions-apiserver v0.22.2
11+
k8s.io/apimachinery v0.22.2
12+
k8s.io/client-go v0.22.2
1413
)

kubectl-pg/go.sum

Lines changed: 212 additions & 147 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)