Skip to content

Commit c75c4f1

Browse files
authored
bump dependencies to support k8s 1.24 (#174)
* bump dependencies to support k8s 1.24 Signed-off-by: Bryce Palmer <[email protected]> * bump operator-lib Signed-off-by: Bryce Palmer <[email protected]> * fix linting issues Signed-off-by: Bryce Palmer <[email protected]> * fix go.mod Signed-off-by: Bryce Palmer <[email protected]> * update testdata Signed-off-by: Bryce Palmer <[email protected]>
1 parent 5b29693 commit c75c4f1

File tree

7 files changed

+303
-623
lines changed

7 files changed

+303
-623
lines changed

go.mod

+61-56
Original file line numberDiff line numberDiff line change
@@ -4,132 +4,139 @@ go 1.17
44

55
require (
66
github.com/blang/semver/v4 v4.0.0
7-
github.com/go-logr/logr v1.2.0
7+
github.com/go-logr/logr v1.2.2
88
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0
99
github.com/iancoleman/strcase v0.2.0
1010
github.com/kr/text v0.2.0
1111
github.com/onsi/ginkgo/v2 v2.1.3
12-
github.com/onsi/gomega v1.17.0
13-
github.com/operator-framework/operator-lib v0.3.0
14-
github.com/prometheus/client_golang v1.11.0
12+
github.com/onsi/gomega v1.18.1
13+
github.com/operator-framework/operator-lib v0.11.0
14+
github.com/prometheus/client_golang v1.12.1
1515
github.com/sergi/go-diff v1.1.0
1616
github.com/sirupsen/logrus v1.8.1
1717
github.com/spf13/afero v1.6.0
18-
github.com/spf13/cobra v1.3.0
18+
github.com/spf13/cobra v1.4.0
1919
github.com/spf13/pflag v1.0.5
20-
github.com/stretchr/testify v1.7.0
20+
github.com/stretchr/testify v1.7.1
2121
gomodules.xyz/jsonpatch/v2 v2.2.0
22-
helm.sh/helm/v3 v3.6.2
23-
k8s.io/api v0.23.5
24-
k8s.io/apiextensions-apiserver v0.23.5
25-
k8s.io/apimachinery v0.23.5
26-
k8s.io/cli-runtime v0.23.1
27-
k8s.io/client-go v0.23.5
28-
k8s.io/kubectl v0.23.1
29-
sigs.k8s.io/controller-runtime v0.11.2
30-
sigs.k8s.io/kubebuilder/v3 v3.0.0-alpha.0.0.20220528140651-800fdeec6e5c
22+
helm.sh/helm/v3 v3.9.0
23+
k8s.io/api v0.24.0
24+
k8s.io/apiextensions-apiserver v0.24.0
25+
k8s.io/apimachinery v0.24.0
26+
k8s.io/cli-runtime v0.24.0
27+
k8s.io/client-go v0.24.0
28+
k8s.io/kubectl v0.24.0
29+
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
30+
sigs.k8s.io/controller-runtime v0.12.1
31+
sigs.k8s.io/kubebuilder/v3 v3.0.0-alpha.0.0.20220607134920-f19b01da2468
3132
sigs.k8s.io/yaml v1.3.0
3233
)
3334

3435
require (
3536
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
36-
github.com/BurntSushi/toml v0.3.1 // indirect
37+
github.com/BurntSushi/toml v1.0.0 // indirect
3738
github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect
3839
github.com/Masterminds/goutils v1.1.1 // indirect
3940
github.com/Masterminds/semver/v3 v3.1.1 // indirect
4041
github.com/Masterminds/sprig/v3 v3.2.2 // indirect
41-
github.com/Masterminds/squirrel v1.5.0 // indirect
42+
github.com/Masterminds/squirrel v1.5.2 // indirect
4243
github.com/Microsoft/go-winio v0.5.1 // indirect
43-
github.com/Microsoft/hcsshim v0.8.14 // indirect
44+
github.com/Microsoft/hcsshim v0.9.1 // indirect
4445
github.com/PuerkitoBio/purell v1.1.1 // indirect
4546
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
4647
github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d // indirect
4748
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect
4849
github.com/beorn7/perks v1.0.1 // indirect
49-
github.com/bshuster-repo/logrus-logstash-hook v0.4.1 // indirect
50+
github.com/bshuster-repo/logrus-logstash-hook v1.0.0 // indirect
5051
github.com/bugsnag/bugsnag-go v1.5.3 // indirect
5152
github.com/bugsnag/panicwrap v1.2.0 // indirect
5253
github.com/cespare/xxhash/v2 v2.1.2 // indirect
5354
github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 // indirect
5455
github.com/cloudflare/cfssl v1.5.0 // indirect
55-
github.com/containerd/cgroups v0.0.0-20200531161412-0dbf7f05ba59 // indirect
56-
github.com/containerd/containerd v1.5.8 // indirect
57-
github.com/cyphar/filepath-securejoin v0.2.2 // indirect
56+
github.com/containerd/cgroups v1.0.2 // indirect
57+
github.com/containerd/containerd v1.6.3 // indirect
58+
github.com/containerd/continuity v0.0.0-20201208142359-180525291bb7 // indirect
59+
github.com/cyphar/filepath-securejoin v0.2.3 // indirect
5860
github.com/davecgh/go-spew v1.1.1 // indirect
59-
github.com/deislabs/oras v0.11.1 // indirect
61+
github.com/distribution/distribution/v3 v3.0.0-20211118083504-a29a3c99a684 // indirect
6062
github.com/docker/cli v20.10.12+incompatible // indirect
61-
github.com/docker/distribution v2.7.1+incompatible // indirect
62-
github.com/docker/docker v20.10.12+incompatible // indirect
63+
github.com/docker/distribution v2.8.1+incompatible // indirect
64+
github.com/docker/docker v20.10.14+incompatible // indirect
6365
github.com/docker/docker-credential-helpers v0.6.4 // indirect
6466
github.com/docker/go-connections v0.4.0 // indirect
67+
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
6568
github.com/docker/go-metrics v0.0.1 // indirect
6669
github.com/docker/go-units v0.4.0 // indirect
6770
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
71+
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
6872
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
6973
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
7074
github.com/fatih/color v1.13.0 // indirect
75+
github.com/felixge/httpsnoop v1.0.1 // indirect
7176
github.com/fsnotify/fsnotify v1.5.1 // indirect
72-
github.com/garyburd/redigo v1.6.0 // indirect
7377
github.com/go-errors/errors v1.0.1 // indirect
78+
github.com/go-gorp/gorp/v3 v3.0.2 // indirect
7479
github.com/go-logr/zapr v1.2.0 // indirect
7580
github.com/go-openapi/jsonpointer v0.19.5 // indirect
7681
github.com/go-openapi/jsonreference v0.19.5 // indirect
7782
github.com/go-openapi/swag v0.19.14 // indirect
78-
github.com/gobuffalo/flect v0.2.3 // indirect
83+
github.com/gobuffalo/flect v0.2.5 // indirect
7984
github.com/gobwas/glob v0.2.3 // indirect
80-
github.com/gofrs/uuid v3.3.0+incompatible // indirect
85+
github.com/gofrs/uuid v4.0.0+incompatible // indirect
8186
github.com/gogo/protobuf v1.3.2 // indirect
8287
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
8388
github.com/golang/protobuf v1.5.2 // indirect
89+
github.com/gomodule/redigo v1.8.2 // indirect
8490
github.com/google/btree v1.0.1 // indirect
8591
github.com/google/certificate-transparency-go v1.0.21 // indirect
92+
github.com/google/gnostic v0.5.7-v3refs // indirect
8693
github.com/google/go-cmp v0.5.6 // indirect
87-
github.com/google/gofuzz v1.1.0 // indirect
94+
github.com/google/gofuzz v1.2.0 // indirect
8895
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
8996
github.com/google/uuid v1.2.0 // indirect
90-
github.com/googleapis/gnostic v0.5.5 // indirect
91-
github.com/gorilla/handlers v1.4.2 // indirect
97+
github.com/gorilla/handlers v1.5.1 // indirect
9298
github.com/gorilla/mux v1.8.0 // indirect
9399
github.com/gosuri/uitable v0.0.4 // indirect
94100
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
95-
github.com/huandu/xstrings v1.3.1 // indirect
101+
github.com/huandu/xstrings v1.3.2 // indirect
96102
github.com/imdario/mergo v0.3.12 // indirect
97103
github.com/inconshreveable/mousetrap v1.0.0 // indirect
98-
github.com/jmoiron/sqlx v1.3.1 // indirect
104+
github.com/jmoiron/sqlx v1.3.4 // indirect
99105
github.com/josharian/intern v1.0.0 // indirect
100106
github.com/json-iterator/go v1.1.12 // indirect
101107
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
102108
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
103109
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
104-
github.com/lib/pq v1.10.0 // indirect
110+
github.com/lib/pq v1.10.4 // indirect
105111
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
106112
github.com/mailru/easyjson v0.7.6 // indirect
107113
github.com/mattn/go-colorable v0.1.12 // indirect
108114
github.com/mattn/go-isatty v0.0.14 // indirect
109-
github.com/mattn/go-runewidth v0.0.7 // indirect
115+
github.com/mattn/go-runewidth v0.0.9 // indirect
110116
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
111-
github.com/mitchellh/copystructure v1.1.1 // indirect
117+
github.com/mitchellh/copystructure v1.2.0 // indirect
112118
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
113119
github.com/mitchellh/mapstructure v1.4.3 // indirect
114-
github.com/mitchellh/reflectwalk v1.0.1 // indirect
120+
github.com/mitchellh/reflectwalk v1.0.2 // indirect
115121
github.com/moby/spdystream v0.2.0 // indirect
116-
github.com/moby/term v0.0.0-20210610120745-9d4ed1856297 // indirect
122+
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
117123
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
118124
github.com/modern-go/reflect2 v1.0.2 // indirect
119125
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
120126
github.com/morikuni/aec v1.0.0 // indirect
127+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
121128
github.com/nxadm/tail v1.4.8 // indirect
122129
github.com/onsi/ginkgo v1.16.5 // indirect
123130
github.com/opencontainers/go-digest v1.0.0 // indirect
124-
github.com/opencontainers/image-spec v1.0.2-0.20211117181255-693428a734f5 // indirect
131+
github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect
125132
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
126133
github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2 // indirect
127134
github.com/pkg/errors v0.9.1 // indirect
128135
github.com/pmezard/go-difflib v1.0.0 // indirect
129136
github.com/prometheus/client_model v0.2.0 // indirect
130137
github.com/prometheus/common v0.32.1 // indirect
131138
github.com/prometheus/procfs v0.7.3 // indirect
132-
github.com/rubenv/sql-migrate v0.0.0-20200616145509-8d140a17f351 // indirect
139+
github.com/rubenv/sql-migrate v1.1.1 // indirect
133140
github.com/russross/blackfriday v1.5.2 // indirect
134141
github.com/shopspring/decimal v1.2.0 // indirect
135142
github.com/spf13/cast v1.4.1 // indirect
@@ -148,34 +155,32 @@ require (
148155
go.uber.org/atomic v1.7.0 // indirect
149156
go.uber.org/multierr v1.6.0 // indirect
150157
go.uber.org/zap v1.19.1 // indirect
151-
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect
152-
golang.org/x/mod v0.5.1 // indirect
153-
golang.org/x/net v0.0.0-20211216030914-fe4d6282115f // indirect
158+
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect
159+
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
160+
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
154161
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
155162
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
156163
golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 // indirect
157-
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
164+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
158165
golang.org/x/text v0.3.7 // indirect
159-
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
160-
golang.org/x/tools v0.1.8 // indirect
166+
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
167+
golang.org/x/tools v0.1.10-0.20220218145154-897bd77cd717 // indirect
161168
golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect
162169
google.golang.org/appengine v1.6.7 // indirect
163-
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
170+
google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368 // indirect
164171
google.golang.org/grpc v1.43.0 // indirect
165172
google.golang.org/protobuf v1.27.1 // indirect
166-
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
167-
gopkg.in/gorp.v1 v1.7.2 // indirect
168173
gopkg.in/inf.v0 v0.9.1 // indirect
169174
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
170175
gopkg.in/yaml.v2 v2.4.0 // indirect
171176
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
172-
k8s.io/apiserver v0.23.5 // indirect
173-
k8s.io/component-base v0.23.5 // indirect
174-
k8s.io/klog/v2 v2.30.0 // indirect
175-
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
176-
k8s.io/utils v0.0.0-20211116205334-6203023598ed // indirect
177-
sigs.k8s.io/controller-tools v0.8.0 // indirect
178-
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
177+
k8s.io/apiserver v0.24.0 // indirect
178+
k8s.io/component-base v0.24.0 // indirect
179+
k8s.io/klog/v2 v2.60.1 // indirect
180+
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
181+
oras.land/oras-go v1.1.0 // indirect
182+
sigs.k8s.io/controller-tools v0.9.0 // indirect
183+
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
179184
sigs.k8s.io/kustomize/api v0.11.4 // indirect
180185
sigs.k8s.io/kustomize/kyaml v0.13.6 // indirect
181186
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect

0 commit comments

Comments
 (0)