Skip to content

Commit c94eaba

Browse files
Merge pull request #1039 from grokspawn/k8s-bump
NO-ISSUE: Synchronize From Upstream Repositories
2 parents e449ed4 + 01b3319 commit c94eaba

File tree

417 files changed

+11990
-4970
lines changed

Some content is hidden

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

417 files changed

+11990
-4970
lines changed

api.blacklist

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
decf74800a179da9f002ae2234204c7e6b866f9a
2+
0ab3debaba2afcffcf16827798c876c7f35a9477

go.mod

Lines changed: 60 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ require (
88
github.com/go-logr/logr v1.4.3
99
github.com/golang/mock v1.6.0
1010
github.com/googleapis/gnostic v0.5.5
11-
github.com/grpc-ecosystem/grpc-health-probe v0.4.38
11+
github.com/grpc-ecosystem/grpc-health-probe v0.4.39
1212
github.com/maxbrunsfeld/counterfeiter/v6 v6.11.2
1313
github.com/mikefarah/yq/v3 v3.0.0-20201202084205-8846255d1c37
1414
github.com/onsi/ginkgo/v2 v2.23.4
1515
github.com/openshift/api v3.9.0+incompatible
16-
github.com/operator-framework/api v0.31.0
16+
github.com/operator-framework/api v0.32.0
1717
github.com/operator-framework/operator-lifecycle-manager v0.0.0-00010101000000-000000000000
18-
github.com/operator-framework/operator-registry v1.55.0
18+
github.com/operator-framework/operator-registry v1.56.0
1919
github.com/sirupsen/logrus v1.9.3
2020
github.com/spf13/cobra v1.9.1
2121
github.com/stretchr/testify v1.10.0
@@ -26,8 +26,8 @@ require (
2626
k8s.io/apimachinery v0.33.2
2727
k8s.io/client-go v0.33.2
2828
k8s.io/code-generator v0.33.2
29-
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff
30-
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
29+
k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a
30+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
3131
sigs.k8s.io/controller-runtime v0.21.0
3232
sigs.k8s.io/controller-tools v0.18.0
3333
)
@@ -39,33 +39,33 @@ require (
3939
replace google.golang.org/grpc => google.golang.org/grpc v1.63.2
4040

4141
require (
42-
cel.dev/expr v0.23.1 // indirect
43-
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
42+
cel.dev/expr v0.24.0 // indirect
43+
github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 // indirect
4444
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
4545
github.com/BurntSushi/toml v1.5.0 // indirect
4646
github.com/MakeNowJust/heredoc v1.0.0 // indirect
4747
github.com/Microsoft/go-winio v0.6.2 // indirect
48-
github.com/Microsoft/hcsshim v0.12.9 // indirect
48+
github.com/Microsoft/hcsshim v0.13.0 // indirect
4949
github.com/NYTimes/gziphandler v1.1.1 // indirect
5050
github.com/VividCortex/ewma v1.2.0 // indirect
5151
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect
5252
github.com/akrylysov/pogreb v0.10.2 // indirect
53-
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
53+
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
5454
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
5555
github.com/beorn7/perks v1.0.1 // indirect
56-
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
56+
github.com/cenkalti/backoff/v5 v5.0.2 // indirect
5757
github.com/cespare/xxhash/v2 v2.3.0 // indirect
5858
github.com/containerd/cgroups/v3 v3.0.5 // indirect
5959
github.com/containerd/containerd v1.7.27 // indirect
60-
github.com/containerd/containerd/api v1.8.0 // indirect
61-
github.com/containerd/continuity v0.4.4 // indirect
60+
github.com/containerd/containerd/api v1.9.0 // indirect
61+
github.com/containerd/continuity v0.4.5 // indirect
6262
github.com/containerd/errdefs v1.0.0 // indirect
6363
github.com/containerd/errdefs/pkg v0.3.0 // indirect
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.7 // indirect
6767
github.com/containerd/typeurl/v2 v2.2.3 // indirect
68-
github.com/containers/common v0.63.0 // indirect
68+
github.com/containers/common v0.63.1 // indirect
6969
github.com/containers/image/v5 v5.35.0 // indirect
7070
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
7171
github.com/containers/ocicrypt v1.2.1 // indirect
@@ -75,29 +75,29 @@ require (
7575
github.com/cyberphone/json-canonicalization v0.0.0-20241213102144-19d51d7fe467 // indirect
7676
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
7777
github.com/distribution/reference v0.6.0 // indirect
78-
github.com/docker/cli v28.1.1+incompatible // indirect
78+
github.com/docker/cli v28.3.1+incompatible // indirect
7979
github.com/docker/distribution v2.8.3+incompatible // indirect
80-
github.com/docker/docker v28.0.4+incompatible // indirect
80+
github.com/docker/docker v28.2.2+incompatible // indirect
8181
github.com/docker/docker-credential-helpers v0.9.3 // indirect
8282
github.com/docker/go-connections v0.5.0 // indirect
8383
github.com/docker/go-units v0.5.0 // indirect
84-
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
84+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
8585
github.com/evanphx/json-patch v5.9.11+incompatible // indirect
8686
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
8787
github.com/fatih/color v1.18.0 // indirect
8888
github.com/felixge/httpsnoop v1.0.4 // indirect
8989
github.com/fsnotify/fsnotify v1.9.0 // indirect
90-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
90+
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
9191
github.com/go-air/gini v1.0.4 // indirect
9292
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
93-
github.com/go-git/go-billy/v5 v5.6.1 // indirect
94-
github.com/go-git/go-git/v5 v5.13.1 // indirect
95-
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
93+
github.com/go-git/go-billy/v5 v5.6.2 // indirect
94+
github.com/go-git/go-git/v5 v5.16.2 // indirect
95+
github.com/go-jose/go-jose/v4 v4.1.0 // indirect
9696
github.com/go-logr/stdr v1.2.2 // indirect
9797
github.com/go-logr/zapr v1.3.0 // indirect
9898
github.com/go-openapi/analysis v0.23.0 // indirect
9999
github.com/go-openapi/errors v0.22.1 // indirect
100-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
100+
github.com/go-openapi/jsonpointer v0.21.1 // indirect
101101
github.com/go-openapi/jsonreference v0.21.0 // indirect
102102
github.com/go-openapi/loads v0.22.0 // indirect
103103
github.com/go-openapi/runtime v0.28.0 // indirect
@@ -116,14 +116,14 @@ require (
116116
github.com/google/cel-go v0.25.0 // indirect
117117
github.com/google/gnostic-models v0.6.9 // indirect
118118
github.com/google/go-cmp v0.7.0 // indirect
119-
github.com/google/go-containerregistry v0.20.3 // indirect
120-
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
119+
github.com/google/go-containerregistry v0.20.6 // indirect
120+
github.com/google/pprof v0.0.0-20250607225305-033d6d78b36a // indirect
121121
github.com/google/uuid v1.6.0 // indirect
122122
github.com/gorilla/mux v1.8.1 // indirect
123123
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
124124
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.2 // indirect
125125
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.1-0.20210315223345-82c243799c99 // indirect
126-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 // indirect
126+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.0 // indirect
127127
github.com/h2non/filetype v1.1.3 // indirect
128128
github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c // indirect
129129
github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -137,7 +137,7 @@ require (
137137
github.com/klauspost/compress v1.18.0 // indirect
138138
github.com/klauspost/pgzip v1.2.6 // indirect
139139
github.com/kylelemons/godebug v1.1.0 // indirect
140-
github.com/letsencrypt/boulder v0.0.0-20240620165639-de9c06129bec // indirect
140+
github.com/letsencrypt/boulder v0.0.0-20250624003606-5ddd5acf990d // indirect
141141
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
142142
github.com/mailru/easyjson v0.9.0 // indirect
143143
github.com/mattn/go-colorable v0.1.13 // indirect
@@ -152,7 +152,7 @@ require (
152152
github.com/moby/spdystream v0.5.0 // indirect
153153
github.com/moby/sys/capability v0.4.0 // indirect
154154
github.com/moby/sys/mountinfo v0.7.2 // indirect
155-
github.com/moby/sys/sequential v0.5.0 // indirect
155+
github.com/moby/sys/sequential v0.6.0 // indirect
156156
github.com/moby/sys/user v0.4.0 // indirect
157157
github.com/moby/sys/userns v0.1.0 // indirect
158158
github.com/moby/term v0.5.2 // indirect
@@ -174,47 +174,48 @@ require (
174174
github.com/prometheus/client_golang v1.22.0 // indirect
175175
github.com/prometheus/client_model v0.6.2 // indirect
176176
github.com/prometheus/common v0.65.0 // indirect
177-
github.com/prometheus/procfs v0.15.1 // indirect
177+
github.com/prometheus/procfs v0.16.1 // indirect
178178
github.com/rivo/uniseg v0.4.7 // indirect
179179
github.com/russross/blackfriday/v2 v2.1.0 // indirect
180180
github.com/secure-systems-lab/go-securesystemslib v0.9.0 // indirect
181-
github.com/sigstore/fulcio v1.6.6 // indirect
182-
github.com/sigstore/protobuf-specs v0.4.1 // indirect
181+
github.com/sigstore/fulcio v1.7.1 // indirect
182+
github.com/sigstore/protobuf-specs v0.4.3 // indirect
183183
github.com/sigstore/rekor v1.3.10 // indirect
184-
github.com/sigstore/sigstore v1.9.3 // indirect
185-
github.com/smallstep/pkcs7 v0.1.1 // indirect
184+
github.com/sigstore/sigstore v1.9.5 // indirect
185+
github.com/smallstep/pkcs7 v0.2.1 // indirect
186186
github.com/spf13/pflag v1.0.6 // indirect
187187
github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect
188188
github.com/stefanberger/go-pkcs11uri v0.0.0-20230803200340-78284954bff6 // indirect
189-
github.com/stoewer/go-strcase v1.3.0 // indirect
189+
github.com/stoewer/go-strcase v1.3.1 // indirect
190190
github.com/tidwall/btree v1.7.0 // indirect
191191
github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 // indirect
192192
github.com/ulikunitz/xz v0.5.12 // indirect
193193
github.com/vbatts/tar-split v0.12.1 // indirect
194-
github.com/vbauerster/mpb/v8 v8.9.3 // indirect
194+
github.com/vbauerster/mpb/v8 v8.10.2 // indirect
195195
github.com/x448/float16 v0.8.4 // indirect
196196
github.com/zeebo/errs v1.4.0 // indirect
197-
go.etcd.io/bbolt v1.4.0 // indirect
197+
go.etcd.io/bbolt v1.4.2 // indirect
198198
go.etcd.io/etcd/api/v3 v3.5.21 // indirect
199199
go.etcd.io/etcd/client/pkg/v3 v3.5.21 // indirect
200200
go.etcd.io/etcd/client/v3 v3.5.21 // indirect
201-
go.mongodb.org/mongo-driver v1.14.0 // indirect
201+
go.mongodb.org/mongo-driver v1.17.4 // indirect
202202
go.opencensus.io v0.24.0 // indirect
203203
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
204-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 // indirect
205-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
206-
go.opentelemetry.io/otel v1.34.0 // indirect
207-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
208-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 // indirect
209-
go.opentelemetry.io/otel/metric v1.34.0 // indirect
210-
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
211-
go.opentelemetry.io/otel/trace v1.34.0 // indirect
212-
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
204+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect
205+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
206+
go.opentelemetry.io/otel v1.36.0 // indirect
207+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.36.0 // indirect
208+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.36.0 // indirect
209+
go.opentelemetry.io/otel/metric v1.36.0 // indirect
210+
go.opentelemetry.io/otel/sdk v1.36.0 // indirect
211+
go.opentelemetry.io/otel/trace v1.36.0 // indirect
212+
go.opentelemetry.io/proto/otlp v1.7.0 // indirect
213213
go.uber.org/automaxprocs v1.6.0 // indirect
214214
go.uber.org/multierr v1.11.0 // indirect
215215
go.uber.org/zap v1.27.0 // indirect
216+
go.yaml.in/yaml/v2 v2.4.2 // indirect
216217
golang.org/x/crypto v0.39.0 // indirect
217-
golang.org/x/exp v0.0.0-20250103183323-7d7fa50e5329 // indirect
218+
golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b // indirect
218219
golang.org/x/lint v0.0.0-20241112194109-818c5a804067 // indirect
219220
golang.org/x/mod v0.25.0 // indirect
220221
golang.org/x/net v0.41.0 // indirect
@@ -224,13 +225,13 @@ require (
224225
golang.org/x/term v0.32.0 // indirect
225226
golang.org/x/text v0.26.0 // indirect
226227
golang.org/x/time v0.12.0 // indirect
227-
golang.org/x/tools v0.33.0 // indirect
228+
golang.org/x/tools v0.34.0 // indirect
228229
golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 // indirect
229230
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
230-
google.golang.org/genproto v0.0.0-20250303144028-a0af3efb3deb // indirect
231-
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
232-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250422160041-2d3770c4ea7f // indirect
233-
google.golang.org/grpc v1.72.1 // indirect
231+
google.golang.org/genproto v0.0.0-20250603155806-513f23925822 // indirect
232+
google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 // indirect
233+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
234+
google.golang.org/grpc v1.73.0 // indirect
234235
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
235236
gopkg.in/inf.v0 v0.9.1 // indirect
236237
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
@@ -239,20 +240,20 @@ require (
239240
gopkg.in/yaml.v3 v3.0.1 // indirect
240241
k8s.io/apiextensions-apiserver v0.33.2 // indirect
241242
k8s.io/apiserver v0.33.2 // indirect
242-
k8s.io/cli-runtime v0.32.0 // indirect
243+
k8s.io/cli-runtime v0.33.2 // indirect
243244
k8s.io/component-base v0.33.2 // indirect
244245
k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7 // indirect
245246
k8s.io/klog v1.0.0 // indirect
246247
k8s.io/klog/v2 v2.130.1 // indirect
247248
k8s.io/kms v0.33.2 // indirect
248249
k8s.io/kube-aggregator v0.33.2 // indirect
249-
k8s.io/kubectl v0.32.0 // indirect
250+
k8s.io/kubectl v0.33.2 // indirect
250251
oras.land/oras-go/v2 v2.6.0 // indirect
251-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
252-
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
252+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.33.0 // indirect
253+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
253254
sigs.k8s.io/randfill v1.0.0 // indirect
254-
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
255-
sigs.k8s.io/yaml v1.4.0 // indirect
255+
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
256+
sigs.k8s.io/yaml v1.5.0 // indirect
256257
)
257258

258259
replace (
@@ -267,6 +268,9 @@ replace (
267268
github.com/operator-framework/operator-lifecycle-manager => ./staging/operator-lifecycle-manager
268269
github.com/operator-framework/operator-registry => ./staging/operator-registry
269270

271+
// pinned because of incompatibility with k8s.io/apiserver otelgrpc API changes
272+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc => go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0
273+
270274
// pinned because no tag supports 1.18 yet
271275
sigs.k8s.io/structured-merge-diff => sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06
272276
)

0 commit comments

Comments
 (0)