Skip to content

Commit a90095d

Browse files
Merge pull request openshift#952 from openshift-bot/synchronize-upstream
NO-ISSUE: Synchronize From Upstream Repositories
2 parents bdee5d9 + 456bc1e commit a90095d

File tree

223 files changed

+5748
-3671
lines changed

Some content is hidden

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

223 files changed

+5748
-3671
lines changed

go.mod

Lines changed: 38 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ require (
2424
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1
2525
google.golang.org/protobuf v1.36.2
2626
gopkg.in/yaml.v2 v2.4.0
27-
k8s.io/api v0.32.0
28-
k8s.io/apimachinery v0.32.0
29-
k8s.io/client-go v0.32.0
30-
k8s.io/code-generator v0.32.0
27+
k8s.io/api v0.32.1
28+
k8s.io/apimachinery v0.32.1
29+
k8s.io/client-go v0.32.1
30+
k8s.io/code-generator v0.32.1
3131
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f
3232
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
33-
sigs.k8s.io/controller-runtime v0.19.4
34-
sigs.k8s.io/controller-tools v0.17.0
33+
sigs.k8s.io/controller-runtime v0.20.1
34+
sigs.k8s.io/controller-tools v0.17.2
3535
)
3636

3737
// latest gRPC library causes changes in the way the CatalogSource connection status behaves
@@ -64,24 +64,24 @@ require (
6464
github.com/containerd/log v0.1.0 // indirect
6565
github.com/containerd/platforms v0.2.1 // indirect
6666
github.com/containerd/ttrpc v1.2.5 // indirect
67-
github.com/containerd/typeurl/v2 v2.2.0 // indirect
67+
github.com/containerd/typeurl/v2 v2.2.3 // indirect
6868
github.com/containers/common v0.61.0 // indirect
69-
github.com/containers/image/v5 v5.33.0 // indirect
69+
github.com/containers/image/v5 v5.34.0 // indirect
7070
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
71-
github.com/containers/ocicrypt v1.2.0 // indirect
72-
github.com/containers/storage v1.56.0 // indirect
71+
github.com/containers/ocicrypt v1.2.1 // indirect
72+
github.com/containers/storage v1.57.1 // indirect
7373
github.com/coreos/go-semver v0.3.1 // indirect
7474
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
7575
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
7676
github.com/distribution/reference v0.6.0 // indirect
77-
github.com/docker/cli v27.4.1+incompatible // indirect
77+
github.com/docker/cli v27.5.1+incompatible // indirect
7878
github.com/docker/distribution v2.8.3+incompatible // indirect
79-
github.com/docker/docker v27.3.1+incompatible // indirect
79+
github.com/docker/docker v27.5.1+incompatible // indirect
8080
github.com/docker/docker-credential-helpers v0.8.2 // indirect
8181
github.com/docker/go-connections v0.5.0 // indirect
8282
github.com/docker/go-units v0.5.0 // indirect
8383
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
84-
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
84+
github.com/evanphx/json-patch v5.9.11+incompatible // indirect
8585
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
8686
github.com/fatih/color v1.18.0 // indirect
8787
github.com/felixge/httpsnoop v1.0.4 // indirect
@@ -104,7 +104,7 @@ require (
104104
github.com/golang-migrate/migrate/v4 v4.18.1 // indirect
105105
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
106106
github.com/golang/protobuf v1.5.4 // indirect
107-
github.com/google/btree v1.0.1 // indirect
107+
github.com/google/btree v1.1.3 // indirect
108108
github.com/google/cel-go v0.22.1 // indirect
109109
github.com/google/gnostic-models v0.6.8 // indirect
110110
github.com/google/go-cmp v0.6.0 // indirect
@@ -138,7 +138,7 @@ require (
138138
github.com/mitchellh/mapstructure v1.5.0 // indirect
139139
github.com/moby/locker v1.0.1 // indirect
140140
github.com/moby/spdystream v0.5.0 // indirect
141-
github.com/moby/sys/capability v0.3.0 // indirect
141+
github.com/moby/sys/capability v0.4.0 // indirect
142142
github.com/moby/sys/mountinfo v0.7.2 // indirect
143143
github.com/moby/sys/sequential v0.5.0 // indirect
144144
github.com/moby/sys/user v0.3.0 // indirect
@@ -153,16 +153,17 @@ require (
153153
github.com/opencontainers/image-spec v1.1.0 // indirect
154154
github.com/opencontainers/runtime-spec v1.2.0 // indirect
155155
github.com/openshift/client-go v0.0.0-20220525160904-9e1acff93e4a // indirect
156-
github.com/otiai10/copy v1.14.0 // indirect
156+
github.com/otiai10/copy v1.14.1 // indirect
157+
github.com/otiai10/mint v1.6.3 // indirect
157158
github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5 // indirect
158159
github.com/pkg/errors v0.9.1 // indirect
159160
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
160161
github.com/prometheus/client_golang v1.20.5 // indirect
161162
github.com/prometheus/client_model v0.6.1 // indirect
162-
github.com/prometheus/common v0.61.0 // indirect
163+
github.com/prometheus/common v0.62.0 // indirect
163164
github.com/prometheus/procfs v0.15.1 // indirect
164165
github.com/russross/blackfriday/v2 v2.1.0 // indirect
165-
github.com/spf13/pflag v1.0.5 // indirect
166+
github.com/spf13/pflag v1.0.6 // indirect
166167
github.com/spiffe/go-spiffe/v2 v2.3.0 // indirect
167168
github.com/stoewer/go-strcase v1.3.0 // indirect
168169
github.com/tidwall/btree v1.7.0 // indirect
@@ -175,48 +176,48 @@ require (
175176
go.opencensus.io v0.24.0 // indirect
176177
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
177178
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
178-
go.opentelemetry.io/otel v1.29.0 // indirect
179+
go.opentelemetry.io/otel v1.31.0 // indirect
179180
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.29.0 // indirect
180181
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.29.0 // indirect
181-
go.opentelemetry.io/otel/metric v1.29.0 // indirect
182+
go.opentelemetry.io/otel/metric v1.31.0 // indirect
182183
go.opentelemetry.io/otel/sdk v1.29.0 // indirect
183-
go.opentelemetry.io/otel/trace v1.29.0 // indirect
184+
go.opentelemetry.io/otel/trace v1.31.0 // indirect
184185
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
185186
go.uber.org/multierr v1.11.0 // indirect
186187
go.uber.org/zap v1.27.0 // indirect
187-
golang.org/x/crypto v0.32.0 // indirect
188-
golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect
188+
golang.org/x/crypto v0.33.0 // indirect
189+
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect
189190
golang.org/x/lint v0.0.0-20241112194109-818c5a804067 // indirect
190191
golang.org/x/mod v0.22.0 // indirect
191-
golang.org/x/net v0.34.0 // indirect
192-
golang.org/x/oauth2 v0.24.0 // indirect
193-
golang.org/x/sync v0.10.0 // indirect
194-
golang.org/x/sys v0.29.0 // indirect
195-
golang.org/x/term v0.28.0 // indirect
196-
golang.org/x/text v0.21.0 // indirect
197-
golang.org/x/time v0.8.0 // indirect
192+
golang.org/x/net v0.35.0 // indirect
193+
golang.org/x/oauth2 v0.25.0 // indirect
194+
golang.org/x/sync v0.11.0 // indirect
195+
golang.org/x/sys v0.30.0 // indirect
196+
golang.org/x/term v0.29.0 // indirect
197+
golang.org/x/text v0.22.0 // indirect
198+
golang.org/x/time v0.10.0 // indirect
198199
golang.org/x/tools v0.29.0 // indirect
199200
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
200201
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
201202
google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1 // indirect
202203
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
203-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
204-
google.golang.org/grpc v1.68.1 // indirect
204+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250102185135-69823020774d // indirect
205+
google.golang.org/grpc v1.69.4 // indirect
205206
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
206207
gopkg.in/inf.v0 v0.9.1 // indirect
207208
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
208209
gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 // indirect
209210
gopkg.in/warnings.v0 v0.1.2 // indirect
210211
gopkg.in/yaml.v3 v3.0.1 // indirect
211-
k8s.io/apiextensions-apiserver v0.32.0 // indirect
212-
k8s.io/apiserver v0.32.0 // indirect
212+
k8s.io/apiextensions-apiserver v0.32.1 // indirect
213+
k8s.io/apiserver v0.32.1 // indirect
213214
k8s.io/cli-runtime v0.32.0 // indirect
214-
k8s.io/component-base v0.32.0 // indirect
215+
k8s.io/component-base v0.32.1 // indirect
215216
k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect
216217
k8s.io/klog v1.0.0 // indirect
217218
k8s.io/klog/v2 v2.130.1 // indirect
218-
k8s.io/kms v0.32.0 // indirect
219-
k8s.io/kube-aggregator v0.32.0 // indirect
219+
k8s.io/kms v0.32.1 // indirect
220+
k8s.io/kube-aggregator v0.32.1 // indirect
220221
k8s.io/kubectl v0.32.0 // indirect
221222
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
222223
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect

0 commit comments

Comments
 (0)