Skip to content

Commit 50d1b16

Browse files
everettravenperdasilva
authored andcommitted
(chore): bump k8s to 1.24 (#964)
* changes to bump to k8s 1.24 Signed-off-by: Bryce Palmer <[email protected]> * changes to bump to k8s 1.24 Signed-off-by: Bryce Palmer <[email protected]> * update prometheus CRDs to have preserveUnknownFields: false Signed-off-by: Bryce Palmer <[email protected]> Upstream-repository: operator-registry Upstream-commit: 043db4f20c13db8535f6991dd9afd590e7427228
1 parent 137f194 commit 50d1b16

File tree

167 files changed

+2417
-704
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

167 files changed

+2417
-704
lines changed

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -217,13 +217,13 @@ require (
217217
go.uber.org/atomic v1.7.0 // indirect
218218
go.uber.org/multierr v1.6.0 // indirect
219219
go.uber.org/zap v1.19.1 // indirect
220-
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect
220+
golang.org/x/crypto v0.0.0-20220408190544-5352b0902921 // indirect
221221
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
222222
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
223-
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
223+
golang.org/x/net v0.0.0-20220407224826-aac1ed45d8e3 // indirect
224224
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
225225
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
226-
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
226+
golang.org/x/sys v0.0.0-20220408201424-a24fb2fb8a0f // indirect
227227
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
228228
golang.org/x/text v0.3.7 // indirect
229229
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect

go.sum

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1340,8 +1340,8 @@ golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm
13401340
golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
13411341
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
13421342
golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
1343-
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd h1:XcWmESyNjXJMLahc3mqVQJcgSTDxFxhETVlfk9uGc38=
1344-
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
1343+
golang.org/x/crypto v0.0.0-20220408190544-5352b0902921 h1:iU7T1X1J6yxDr0rda54sWGkHgOp5XJrqm79gcNlC2VM=
1344+
golang.org/x/crypto v0.0.0-20220408190544-5352b0902921/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
13451345
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
13461346
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
13471347
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -1447,8 +1447,8 @@ golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qx
14471447
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
14481448
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
14491449
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
1450-
golang.org/x/net v0.0.0-20220225172249-27dd8689420f h1:oA4XRj0qtSt8Yo1Zms0CUlsT3KG69V2UGQWPBxujDmc=
1451-
golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
1450+
golang.org/x/net v0.0.0-20220407224826-aac1ed45d8e3 h1:EN5+DfgmRMvRUrMGERW2gQl3Vc+Z7ZMnI/xdEpPSf0c=
1451+
golang.org/x/net v0.0.0-20220407224826-aac1ed45d8e3/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
14521452
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
14531453
golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
14541454
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -1594,8 +1594,9 @@ golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBc
15941594
golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
15951595
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
15961596
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1597-
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 h1:rm+CHSpPEEW2IsXUib1ThaHIjuBVZjxNgSKmBLFfD4c=
15981597
golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1598+
golang.org/x/sys v0.0.0-20220408201424-a24fb2fb8a0f h1:8w7RhxzTVgUzw/AH/9mUV5q0vMgy40SQRursCcfmkCw=
1599+
golang.org/x/sys v0.0.0-20220408201424-a24fb2fb8a0f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
15991600
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
16001601
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY=
16011602
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=

staging/operator-registry/go.mod

Lines changed: 44 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
github.com/blang/semver/v4 v4.0.0
88
github.com/containerd/containerd v1.4.11
99
github.com/docker/cli v20.10.12+incompatible
10-
github.com/docker/distribution v2.7.1+incompatible
10+
github.com/docker/distribution v2.8.1+incompatible
1111
github.com/docker/docker v1.4.2-0.20200203170920-46ec8731fbce
1212
github.com/ghodss/yaml v1.0.0
1313
github.com/golang-migrate/migrate/v4 v4.6.2
@@ -21,33 +21,33 @@ require (
2121
github.com/mattn/go-sqlite3 v1.14.10
2222
github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2
2323
github.com/mitchellh/hashstructure/v2 v2.0.2
24-
github.com/onsi/ginkgo v1.16.4
25-
github.com/onsi/gomega v1.15.0
24+
github.com/onsi/ginkgo v1.16.5
25+
github.com/onsi/gomega v1.18.1
2626
github.com/opencontainers/go-digest v1.0.0
2727
github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6
28-
github.com/operator-framework/api v0.12.0
28+
github.com/operator-framework/api v0.15.0
2929
github.com/otiai10/copy v1.2.0
3030
github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2
3131
github.com/pkg/errors v0.9.1
3232
github.com/sirupsen/logrus v1.8.1
33-
github.com/spf13/cobra v1.2.1
33+
github.com/spf13/cobra v1.4.0
3434
github.com/stretchr/testify v1.7.0
3535
go.etcd.io/bbolt v1.3.6
36-
golang.org/x/mod v0.4.2
37-
golang.org/x/net v0.0.0-20210825183410-e898025ed96a
36+
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3
37+
golang.org/x/net v0.0.0-20220407224826-aac1ed45d8e3
3838
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
3939
google.golang.org/grpc v1.40.0
4040
google.golang.org/grpc/cmd/protoc-gen-go-grpc v0.0.0-20200709232328-d8193ee9cc3e
4141
google.golang.org/protobuf v1.27.1
4242
gopkg.in/yaml.v2 v2.4.0
43-
k8s.io/api v0.22.1
44-
k8s.io/apiextensions-apiserver v0.22.1
45-
k8s.io/apimachinery v0.22.1
46-
k8s.io/client-go v0.22.1
47-
k8s.io/kubectl v0.22.0
48-
sigs.k8s.io/controller-runtime v0.10.0
43+
k8s.io/api v0.24.0
44+
k8s.io/apiextensions-apiserver v0.24.0
45+
k8s.io/apimachinery v0.24.0
46+
k8s.io/client-go v0.24.0
47+
k8s.io/kubectl v0.24.0
48+
sigs.k8s.io/controller-runtime v0.12.1
4949
sigs.k8s.io/kind v0.11.1
50-
sigs.k8s.io/yaml v1.2.0
50+
sigs.k8s.io/yaml v1.3.0
5151
)
5252

5353
require (
@@ -67,7 +67,7 @@ require (
6767
github.com/bshuster-repo/logrus-logstash-hook v0.4.1 // indirect
6868
github.com/bugsnag/bugsnag-go v1.5.3 // indirect
6969
github.com/bugsnag/panicwrap v1.2.0 // indirect
70-
github.com/cespare/xxhash/v2 v2.1.1 // indirect
70+
github.com/cespare/xxhash/v2 v2.1.2 // indirect
7171
github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f // indirect
7272
github.com/containerd/continuity v0.0.0-20200413184840-d3ef23f19fbb // indirect
7373
github.com/containerd/ttrpc v1.0.1 // indirect
@@ -78,51 +78,54 @@ require (
7878
github.com/docker/go-metrics v0.0.1 // indirect
7979
github.com/docker/go-units v0.4.0 // indirect
8080
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
81-
github.com/evanphx/json-patch v4.11.0+incompatible // indirect
81+
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
82+
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
8283
github.com/evanphx/json-patch/v5 v5.2.0 // indirect
8384
github.com/felixge/httpsnoop v1.0.1 // indirect
84-
github.com/fsnotify/fsnotify v1.4.9 // indirect
85+
github.com/fsnotify/fsnotify v1.5.1 // indirect
8586
github.com/garyburd/redigo v1.6.0 // indirect
8687
github.com/go-git/gcfg v1.5.0 // indirect
8788
github.com/go-git/go-billy/v5 v5.1.0 // indirect
8889
github.com/go-git/go-git/v5 v5.3.0 // indirect
89-
github.com/go-logr/logr v0.4.0 // indirect
90+
github.com/go-logr/logr v1.2.0 // indirect
9091
github.com/go-openapi/jsonpointer v0.19.5 // indirect
9192
github.com/go-openapi/jsonreference v0.19.5 // indirect
9293
github.com/go-openapi/swag v0.19.14 // indirect
9394
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
9495
github.com/gofrs/uuid v3.3.0+incompatible // indirect
9596
github.com/gogo/protobuf v1.3.2 // indirect
9697
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
97-
github.com/google/cel-go v0.9.0 // indirect
98+
github.com/google/cel-go v0.10.1 // indirect
99+
github.com/google/gnostic v0.5.7-v3refs // indirect
98100
github.com/google/gofuzz v1.1.0 // indirect
99-
github.com/googleapis/gnostic v0.5.5 // indirect
101+
github.com/google/uuid v1.1.2 // indirect
100102
github.com/gorilla/handlers v1.4.2 // indirect
101-
github.com/gorilla/mux v1.7.2 // indirect
103+
github.com/gorilla/mux v1.8.0 // indirect
102104
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
103105
github.com/imdario/mergo v0.3.12 // indirect
104106
github.com/inconshreveable/mousetrap v1.0.0 // indirect
105107
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
106108
github.com/josharian/intern v1.0.0 // indirect
107-
github.com/json-iterator/go v1.1.11 // indirect
109+
github.com/json-iterator/go v1.1.12 // indirect
108110
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
109111
github.com/mailru/easyjson v0.7.6 // indirect
110112
github.com/mattn/go-isatty v0.0.12 // indirect
111113
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
112114
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
113115
github.com/mitchellh/mapstructure v1.4.1 // indirect
114116
github.com/moby/spdystream v0.2.0 // indirect
115-
github.com/moby/term v0.0.0-20210610120745-9d4ed1856297 // indirect
117+
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
116118
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
117-
github.com/modern-go/reflect2 v1.0.1 // indirect
119+
github.com/modern-go/reflect2 v1.0.2 // indirect
118120
github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c // indirect
121+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
119122
github.com/nxadm/tail v1.4.8 // indirect
120123
github.com/pelletier/go-toml v1.9.3 // indirect
121124
github.com/pmezard/go-difflib v1.0.0 // indirect
122-
github.com/prometheus/client_golang v1.11.0 // indirect
125+
github.com/prometheus/client_golang v1.12.1 // indirect
123126
github.com/prometheus/client_model v0.2.0 // indirect
124-
github.com/prometheus/common v0.26.0 // indirect
125-
github.com/prometheus/procfs v0.6.0 // indirect
127+
github.com/prometheus/common v0.32.1 // indirect
128+
github.com/prometheus/procfs v0.7.3 // indirect
126129
github.com/russross/blackfriday v1.5.2 // indirect
127130
github.com/spf13/pflag v1.0.5 // indirect
128131
github.com/stoewer/go-strcase v1.2.0 // indirect
@@ -140,27 +143,28 @@ require (
140143
go.opentelemetry.io/otel/sdk/metric v0.20.0 // indirect
141144
go.opentelemetry.io/otel/trace v0.20.0 // indirect
142145
go.opentelemetry.io/proto/otlp v0.7.0 // indirect
143-
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 // indirect
144-
golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602 // indirect
145-
golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359 // indirect
146-
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
146+
golang.org/x/crypto v0.0.0-20220408190544-5352b0902921 // indirect
147+
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
148+
golang.org/x/sys v0.0.0-20220408201424-a24fb2fb8a0f // indirect
149+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
147150
golang.org/x/text v0.3.7 // indirect
148-
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
149-
golang.org/x/tools v0.1.5 // indirect
151+
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
152+
golang.org/x/tools v0.1.10-0.20220218145154-897bd77cd717 // indirect
150153
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
151154
google.golang.org/appengine v1.6.7 // indirect
152155
google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2 // indirect
153156
gopkg.in/inf.v0 v0.9.1 // indirect
154157
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
155158
gopkg.in/warnings.v0 v0.1.2 // indirect
156159
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
157-
k8s.io/apiserver v0.22.1 // indirect
158-
k8s.io/component-base v0.22.1 // indirect
159-
k8s.io/klog/v2 v2.9.0 // indirect
160-
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e // indirect
161-
k8s.io/utils v0.0.0-20210802155522-efc7438f0176 // indirect
162-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.22 // indirect
163-
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
160+
k8s.io/apiserver v0.24.0 // indirect
161+
k8s.io/component-base v0.24.0 // indirect
162+
k8s.io/klog/v2 v2.60.1 // indirect
163+
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
164+
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
165+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30 // indirect
166+
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
167+
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
164168
)
165169

166170
// latest tag resolves to a very old version. this is only used for spinning up local test registries

0 commit comments

Comments
 (0)