Skip to content
This repository was archived by the owner on May 24, 2023. It is now read-only.

Commit e8180da

Browse files
authored
Update Go to 1.17 (#200)
1 parent ded716b commit e8180da

File tree

4 files changed

+306
-64
lines changed

4 files changed

+306
-64
lines changed

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM golang:1.16 as builder
2+
FROM golang:1.17 as builder
33
ARG VERSION
44

55
WORKDIR /workspace

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ BUNDLE_IMG ?= $(IMAGE_TAG_BASE)-bundle:v$(VERSION)
4141
IMG ?= $(IMAGE_TAG_BASE):$(VERSION)
4242

4343
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
44-
ENVTEST_K8S_VERSION = 1.22
44+
ENVTEST_K8S_VERSION = 1.23
4545

4646
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
4747
ifeq (,$(shell go env GOBIN))
@@ -150,7 +150,7 @@ undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/confi
150150
CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
151151
.PHONY: controller-gen
152152
controller-gen: ## Download controller-gen locally if necessary.
153-
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.7.0)
153+
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.8.0)
154154

155155
KUSTOMIZE = $(shell pwd)/bin/kustomize
156156
.PHONY: kustomize

go.mod

+66-8
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,75 @@
11
module github.com/nginxinc/nginx-ingress-operator
22

3-
go 1.16
3+
go 1.17
44

55
require (
6-
github.com/go-logr/logr v0.4.0
6+
github.com/go-logr/logr v1.2.0
77
github.com/google/go-cmp v0.5.6
88
github.com/onsi/ginkgo v1.16.5
99
github.com/onsi/gomega v1.17.0
1010
github.com/openshift/api v0.0.0-20201013121701-9d5ee23b507d
11-
golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e // indirect
12-
k8s.io/api v0.22.1
13-
k8s.io/apiextensions-apiserver v0.22.1
14-
k8s.io/apimachinery v0.22.1
15-
k8s.io/client-go v0.22.1
16-
sigs.k8s.io/controller-runtime v0.10.0
11+
k8s.io/api v0.23.1
12+
k8s.io/apiextensions-apiserver v0.23.1
13+
k8s.io/apimachinery v0.23.1
14+
k8s.io/client-go v0.23.1
15+
sigs.k8s.io/controller-runtime v0.11.0
16+
)
17+
18+
require (
19+
cloud.google.com/go v0.81.0 // indirect
20+
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
21+
github.com/Azure/go-autorest/autorest v0.11.18 // indirect
22+
github.com/Azure/go-autorest/autorest/adal v0.9.13 // indirect
23+
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
24+
github.com/Azure/go-autorest/logger v0.2.1 // indirect
25+
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
26+
github.com/beorn7/perks v1.0.1 // indirect
27+
github.com/cespare/xxhash/v2 v2.1.1 // indirect
28+
github.com/davecgh/go-spew v1.1.1 // indirect
29+
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
30+
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
31+
github.com/fsnotify/fsnotify v1.5.1 // indirect
32+
github.com/go-logr/zapr v1.2.0 // indirect
33+
github.com/gogo/protobuf v1.3.2 // indirect
34+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
35+
github.com/golang/protobuf v1.5.2 // indirect
36+
github.com/google/gofuzz v1.1.0 // indirect
37+
github.com/google/uuid v1.1.2 // indirect
38+
github.com/googleapis/gnostic v0.5.5 // indirect
39+
github.com/imdario/mergo v0.3.12 // indirect
40+
github.com/json-iterator/go v1.1.12 // indirect
41+
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
42+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
43+
github.com/modern-go/reflect2 v1.0.2 // indirect
44+
github.com/nxadm/tail v1.4.8 // indirect
45+
github.com/pkg/errors v0.9.1 // indirect
46+
github.com/prometheus/client_golang v1.11.0 // indirect
47+
github.com/prometheus/client_model v0.2.0 // indirect
48+
github.com/prometheus/common v0.28.0 // indirect
49+
github.com/prometheus/procfs v0.6.0 // indirect
50+
github.com/spf13/pflag v1.0.5 // indirect
51+
go.uber.org/atomic v1.7.0 // indirect
52+
go.uber.org/multierr v1.6.0 // indirect
53+
go.uber.org/zap v1.19.1 // indirect
54+
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
55+
golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect
56+
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
57+
golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8 // indirect
58+
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
59+
golang.org/x/text v0.3.7 // indirect
60+
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
61+
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
62+
google.golang.org/appengine v1.6.7 // indirect
63+
google.golang.org/protobuf v1.27.1 // indirect
64+
gopkg.in/inf.v0 v0.9.1 // indirect
65+
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
66+
gopkg.in/yaml.v2 v2.4.0 // indirect
67+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
68+
k8s.io/component-base v0.23.1 // indirect
69+
k8s.io/klog/v2 v2.30.0 // indirect
70+
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
71+
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b // indirect
72+
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
73+
sigs.k8s.io/structured-merge-diff/v4 v4.2.0 // indirect
74+
sigs.k8s.io/yaml v1.3.0 // indirect
1775
)

0 commit comments

Comments
 (0)