Skip to content

Commit 7b8e1bc

Browse files
committed
Upgrade to golang 1.17
1 parent 1ee54b2 commit 7b8e1bc

File tree

4 files changed

+70
-16
lines changed

4 files changed

+70
-16
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG DOCKER_REGISTRY
22
ARG ALPINE_VERSION=3.14
3-
FROM ${DOCKER_REGISTRY:+$DOCKER_REGISTRY/}golang:1.16-alpine${ALPINE_VERSION} as go-builder
3+
FROM ${DOCKER_REGISTRY:+$DOCKER_REGISTRY/}golang:1.17-alpine${ALPINE_VERSION} as go-builder
44

55
ARG PROJECT_NAME=zookeeper-operator
66
ARG REPO_PATH=github.com/pravega/$PROJECT_NAME

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ The list of available commands are
374374
### Build the operator image
375375

376376
Requirements:
377-
- Go 1.16+
377+
- Go 1.17+
378378

379379
Use the `make` command to build the Zookeeper operator image.
380380

go.mod

Lines changed: 67 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,104 @@
11
module github.com/pravega/zookeeper-operator
22

3-
go 1.16
3+
go 1.17
44

55
require (
6+
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
7+
github.com/go-logr/logr v0.4.0
8+
github.com/onsi/ginkgo v1.16.4
9+
github.com/onsi/gomega v1.14.0
10+
github.com/operator-framework/operator-lib v0.7.0
11+
github.com/operator-framework/operator-sdk v0.19.4
12+
github.com/pkg/errors v0.9.1
13+
github.com/samuel/go-zookeeper v0.0.0-20201211165307-7117e9ea2414
14+
github.com/sirupsen/logrus v1.8.1
15+
k8s.io/api v0.22.2
16+
k8s.io/apimachinery v0.22.2
17+
k8s.io/client-go v12.0.0+incompatible
18+
sigs.k8s.io/controller-runtime v0.10.2
19+
)
20+
21+
require (
22+
cloud.google.com/go v0.81.0 // indirect
23+
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
624
github.com/Azure/go-autorest/autorest v0.11.21 // indirect
725
github.com/Azure/go-autorest/autorest/adal v0.9.16 // indirect
26+
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
27+
github.com/Azure/go-autorest/logger v0.2.1 // indirect
28+
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
829
github.com/Microsoft/go-winio v0.4.15 // indirect
930
github.com/Microsoft/hcsshim v0.8.10-0.20200715222032-5eafd1556990 // indirect
31+
github.com/beorn7/perks v1.0.1 // indirect
32+
github.com/blang/semver v3.5.1+incompatible // indirect
1033
github.com/cespare/xxhash/v2 v2.1.2 // indirect
1134
github.com/containerd/containerd v1.4.11 // indirect
1235
github.com/containerd/ttrpc v1.0.2 // indirect
36+
github.com/davecgh/go-spew v1.1.1 // indirect
1337
github.com/docker/docker v20.10.2+incompatible // indirect
14-
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
15-
github.com/go-logr/logr v0.4.0
38+
github.com/evanphx/json-patch v4.9.0+incompatible // indirect
39+
github.com/fsnotify/fsnotify v1.4.9 // indirect
40+
github.com/go-logr/zapr v0.1.1 // indirect
41+
github.com/gobuffalo/envy v1.7.1 // indirect
42+
github.com/gogo/protobuf v1.3.2 // indirect
43+
github.com/golang-jwt/jwt/v4 v4.0.0 // indirect
1644
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
45+
github.com/golang/protobuf v1.5.2 // indirect
46+
github.com/google/go-cmp v0.5.6 // indirect
47+
github.com/google/gofuzz v1.1.0 // indirect
1748
github.com/google/uuid v1.1.5 // indirect
1849
github.com/googleapis/gnostic v0.5.5 // indirect
1950
github.com/gorilla/mux v1.8.0 // indirect
51+
github.com/hashicorp/golang-lru v0.5.4 // indirect
2052
github.com/imdario/mergo v0.3.12 // indirect
53+
github.com/inconshreveable/mousetrap v1.0.0 // indirect
54+
github.com/joho/godotenv v1.3.0 // indirect
2155
github.com/json-iterator/go v1.1.12 // indirect
22-
github.com/onsi/ginkgo v1.16.4
23-
github.com/onsi/gomega v1.14.0
56+
github.com/markbates/inflect v1.0.4 // indirect
57+
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
58+
github.com/mitchellh/go-homedir v1.1.0 // indirect
59+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
60+
github.com/modern-go/reflect2 v1.0.2 // indirect
61+
github.com/nxadm/tail v1.4.8 // indirect
2462
github.com/operator-framework/api v0.10.7 // indirect
25-
github.com/operator-framework/operator-lib v0.7.0
2663
github.com/operator-framework/operator-registry v1.13.9 // indirect
27-
github.com/operator-framework/operator-sdk v0.19.4
2864
github.com/pborman/uuid v1.2.1 // indirect
29-
github.com/pkg/errors v0.9.1
65+
github.com/prometheus/client_golang v1.11.0 // indirect
66+
github.com/prometheus/client_model v0.2.0 // indirect
67+
github.com/prometheus/common v0.26.0 // indirect
68+
github.com/prometheus/procfs v0.6.0 // indirect
3069
github.com/rogpeppe/go-internal v1.5.2 // indirect
31-
github.com/samuel/go-zookeeper v0.0.0-20201211165307-7117e9ea2414
32-
github.com/sirupsen/logrus v1.8.1
70+
github.com/spf13/afero v1.6.0 // indirect
71+
github.com/spf13/cobra v1.2.1 // indirect
72+
github.com/spf13/pflag v1.0.5 // indirect
73+
go.uber.org/atomic v1.7.0 // indirect
74+
go.uber.org/multierr v1.6.0 // indirect
75+
go.uber.org/zap v1.17.0 // indirect
3376
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect
77+
golang.org/x/mod v0.4.2 // indirect
3478
golang.org/x/net v0.0.0-20211007125505-59d4e928ea9d // indirect
3579
golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1 // indirect
3680
golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac // indirect
3781
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
3882
golang.org/x/text v0.3.7 // indirect
3983
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
4084
golang.org/x/tools v0.1.7 // indirect
85+
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
86+
gomodules.xyz/jsonpatch/v2 v2.0.1 // indirect
87+
google.golang.org/appengine v1.6.7 // indirect
4188
google.golang.org/genproto v0.0.0-20211007155348-82e027067bd4 // indirect
42-
k8s.io/api v0.22.2
89+
google.golang.org/grpc v1.40.0 // indirect
90+
google.golang.org/protobuf v1.27.1 // indirect
91+
gopkg.in/inf.v0 v0.9.1 // indirect
92+
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
93+
gopkg.in/yaml.v2 v2.4.0 // indirect
94+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
4395
k8s.io/apiextensions-apiserver v0.22.2 // indirect
44-
k8s.io/apimachinery v0.22.2
45-
k8s.io/client-go v12.0.0+incompatible
96+
k8s.io/klog/v2 v2.2.0 // indirect
4697
k8s.io/kube-openapi v0.0.0-20210929172449-94abcedd1aa4 // indirect
4798
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b // indirect
48-
sigs.k8s.io/controller-runtime v0.10.2
99+
sigs.k8s.io/kubebuilder v1.0.9-0.20200618125005-36aa113dbe99 // indirect
100+
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
101+
sigs.k8s.io/yaml v1.2.0 // indirect
49102
)
50103

51104
replace (

pkg/apis/zookeeper/v1beta1/zz_generated.deepcopy.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)