Skip to content

Commit d6126d8

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #3231 from alvaroaleman/bump-see
🌱 Bump k8s.io/* deps for fakeclient SSA fixes
2 parents 8f791a2 + 4593377 commit d6126d8

File tree

7 files changed

+117
-110
lines changed

7 files changed

+117
-110
lines changed

‎.gomodcheck.yaml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
upstreamRefs:
2-
- k8s.io/api
3-
- k8s.io/apiextensions-apiserver
4-
- k8s.io/apimachinery
5-
- k8s.io/apiserver
6-
- k8s.io/client-go
7-
- k8s.io/component-base
2+
# Disabled until we have a 1.34 release due to https://github.com/kubernetes-sigs/controller-runtime/pull/3231
3+
# - k8s.io/api
4+
# - k8s.io/apiextensions-apiserver
5+
# - k8s.io/apimachinery
6+
# - k8s.io/apiserver
7+
# - k8s.io/client-go
8+
# - k8s.io/component-base
89
# k8s.io/klog/v2 -> conflicts with k/k deps
910
# k8s.io/utils -> conflicts with k/k deps
1011

‎examples/scratch-env/go.mod‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ require (
1515
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
1616
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
1717
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
18-
github.com/fsnotify/fsnotify v1.7.0 // indirect
19-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
18+
github.com/fsnotify/fsnotify v1.9.0 // indirect
19+
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
2020
github.com/go-logr/logr v1.4.2 // indirect
2121
github.com/go-logr/zapr v1.3.0 // indirect
2222
github.com/go-openapi/jsonpointer v0.21.0 // indirect
@@ -52,16 +52,16 @@ require (
5252
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
5353
gopkg.in/inf.v0 v0.9.1 // indirect
5454
gopkg.in/yaml.v3 v3.0.1 // indirect
55-
k8s.io/api v0.33.0 // indirect
55+
k8s.io/api v0.34.0-alpha.0 // indirect
5656
k8s.io/apiextensions-apiserver v0.33.0 // indirect
57-
k8s.io/apimachinery v0.33.0 // indirect
58-
k8s.io/client-go v0.33.0 // indirect
57+
k8s.io/apimachinery v0.34.0-alpha.0.0.20250602220442-a925cd7fb3fd // indirect
58+
k8s.io/client-go v0.34.0-alpha.0 // indirect
5959
k8s.io/klog/v2 v2.130.1 // indirect
6060
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
61-
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
61+
k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979 // indirect
6262
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
6363
sigs.k8s.io/randfill v1.0.0 // indirect
64-
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
64+
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
6565
sigs.k8s.io/yaml v1.4.0 // indirect
6666
)
6767

‎examples/scratch-env/go.sum‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ github.com/evanphx/json-patch v0.5.2 h1:xVCHIVMUu1wtM/VkR9jVZ45N3FhZfYMMYGorLCR8
1515
github.com/evanphx/json-patch v0.5.2/go.mod h1:ZWS5hhDbVDyob71nXKNL0+PWn6ToqBHMikGIFbs31qQ=
1616
github.com/evanphx/json-patch/v5 v5.9.11 h1:/8HVnzMq13/3x9TPvjG08wUGqBTmZBsCWzjTM0wiaDU=
1717
github.com/evanphx/json-patch/v5 v5.9.11/go.mod h1:3j+LviiESTElxA4p3EMKAB9HXj3/XEtnUf6OZxqIQTM=
18-
github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
19-
github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
20-
github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E=
21-
github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ=
18+
github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
19+
github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
20+
github.com/fxamacker/cbor/v2 v2.8.0 h1:fFtUGXUzXPHTIUdne5+zzMPTfffl3RD5qYnkY40vtxU=
21+
github.com/fxamacker/cbor/v2 v2.8.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
2222
github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
2323
github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
2424
github.com/go-logr/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ=
@@ -171,26 +171,26 @@ gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
171171
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
172172
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
173173
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
174-
k8s.io/api v0.33.0 h1:yTgZVn1XEe6opVpP1FylmNrIFWuDqe2H0V8CT5gxfIU=
175-
k8s.io/api v0.33.0/go.mod h1:CTO61ECK/KU7haa3qq8sarQ0biLq2ju405IZAd9zsiM=
174+
k8s.io/api v0.34.0-alpha.0 h1:plVaaO0yCTOGvWjEiEvvecQOPpf/IYdLnVMsfGfGMQo=
175+
k8s.io/api v0.34.0-alpha.0/go.mod h1:brriDRpq4yMP4PN4P48NfXVLwWSwaIFSe0+pOajiwjQ=
176176
k8s.io/apiextensions-apiserver v0.33.0 h1:d2qpYL7Mngbsc1taA4IjJPRJ9ilnsXIrndH+r9IimOs=
177177
k8s.io/apiextensions-apiserver v0.33.0/go.mod h1:VeJ8u9dEEN+tbETo+lFkwaaZPg6uFKLGj5vyNEwwSzc=
178-
k8s.io/apimachinery v0.33.0 h1:1a6kHrJxb2hs4t8EE5wuR/WxKDwGN1FKH3JvDtA0CIQ=
179-
k8s.io/apimachinery v0.33.0/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
180-
k8s.io/client-go v0.33.0 h1:UASR0sAYVUzs2kYuKn/ZakZlcs2bEHaizrrHUZg0G98=
181-
k8s.io/client-go v0.33.0/go.mod h1:kGkd+l/gNGg8GYWAPr0xF1rRKvVWvzh9vmZAMXtaKOg=
178+
k8s.io/apimachinery v0.34.0-alpha.0.0.20250602220442-a925cd7fb3fd h1:hEB6nMYKxQliqPLNvPMphaONlcn3wmbKvVtaL1vbN8U=
179+
k8s.io/apimachinery v0.34.0-alpha.0.0.20250602220442-a925cd7fb3fd/go.mod h1:pJRnLHx/rdGhRBHKhKq/NczIcMw4cPylIe+hff1zJaU=
180+
k8s.io/client-go v0.34.0-alpha.0 h1:+hfihZ7vffuzoS4BoYg2nWs+9Bc1hXpZ7+iev2ISCo0=
181+
k8s.io/client-go v0.34.0-alpha.0/go.mod h1:0sClwbFRpXuYhqaJEqLiy+e9dlC7FOhFHc9ZdvLDAbU=
182182
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
183183
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
184184
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUyGcf03XZEP0ZIKgKj35LS4=
185185
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8=
186-
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro=
187-
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
186+
k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979 h1:jgJW5IePPXLGB8e/1wvd0Ich9QE97RvvF3a8J3fP/Lg=
187+
k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
188188
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=
189189
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo=
190190
sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
191191
sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=
192192
sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
193-
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 h1:IUA9nvMmnKWcj5jl84xn+T5MnlZKThmUW1TdblaLVAc=
194-
sigs.k8s.io/structured-merge-diff/v4 v4.6.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps=
193+
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 h1:qPeWmscJcXP0snki5IYF79Z8xrl8ETFxgMd7wez1XkI=
194+
sigs.k8s.io/structured-merge-diff/v4 v4.7.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps=
195195
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
196196
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=

‎go.mod‎

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.24.0
55
require (
66
github.com/blang/semver/v4 v4.0.0
77
github.com/evanphx/json-patch/v5 v5.9.11
8-
github.com/fsnotify/fsnotify v1.7.0
8+
github.com/fsnotify/fsnotify v1.9.0
99
github.com/go-logr/logr v1.4.2
1010
github.com/go-logr/zapr v1.3.0
1111
github.com/google/btree v1.1.3
@@ -22,37 +22,37 @@ require (
2222
golang.org/x/sys v0.31.0
2323
gomodules.xyz/jsonpatch/v2 v2.4.0
2424
gopkg.in/evanphx/json-patch.v4 v4.12.0 // Using v4 to match upstream
25-
k8s.io/api v0.33.0
26-
k8s.io/apiextensions-apiserver v0.33.0
27-
k8s.io/apimachinery v0.33.0
28-
k8s.io/apiserver v0.33.0
29-
k8s.io/client-go v0.33.0
25+
k8s.io/api v0.34.0-alpha.0
26+
k8s.io/apiextensions-apiserver v0.0.0-20250527181603-1e69f9c86d5a
27+
k8s.io/apimachinery v0.34.0-alpha.0.0.20250602220442-a925cd7fb3fd
28+
k8s.io/apiserver v0.0.0-20250528055411-b50caf5d6623
29+
k8s.io/client-go v0.34.0-alpha.0
3030
k8s.io/klog/v2 v2.130.1
31-
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
31+
k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979
3232
sigs.k8s.io/yaml v1.4.0
3333
)
3434

3535
require (
36-
cel.dev/expr v0.19.1 // indirect
36+
cel.dev/expr v0.23.1 // indirect
3737
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
3838
github.com/beorn7/perks v1.0.1 // indirect
3939
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
4040
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4141
github.com/davecgh/go-spew v1.1.1 // indirect
4242
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
4343
github.com/felixge/httpsnoop v1.0.4 // indirect
44-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
44+
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
4545
github.com/go-logr/stdr v1.2.2 // indirect
4646
github.com/go-openapi/jsonpointer v0.21.0 // indirect
4747
github.com/go-openapi/jsonreference v0.20.2 // indirect
4848
github.com/go-openapi/swag v0.23.0 // indirect
4949
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
5050
github.com/gogo/protobuf v1.3.2 // indirect
51-
github.com/google/cel-go v0.23.2 // indirect
51+
github.com/google/cel-go v0.25.0 // indirect
5252
github.com/google/gnostic-models v0.6.9 // indirect
5353
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
5454
github.com/google/uuid v1.6.0 // indirect
55-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect
55+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
5656
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5757
github.com/josharian/intern v1.0.0 // indirect
5858
github.com/json-iterator/go v1.1.12 // indirect
@@ -65,18 +65,18 @@ require (
6565
github.com/prometheus/common v0.62.0 // indirect
6666
github.com/prometheus/procfs v0.15.1 // indirect
6767
github.com/spf13/cobra v1.8.1 // indirect
68-
github.com/spf13/pflag v1.0.5 // indirect
68+
github.com/spf13/pflag v1.0.6 // indirect
6969
github.com/stoewer/go-strcase v1.3.0 // indirect
7070
github.com/x448/float16 v0.8.4 // indirect
7171
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
7272
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
73-
go.opentelemetry.io/otel v1.33.0 // indirect
74-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
75-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 // indirect
76-
go.opentelemetry.io/otel/metric v1.33.0 // indirect
77-
go.opentelemetry.io/otel/sdk v1.33.0 // indirect
78-
go.opentelemetry.io/otel/trace v1.33.0 // indirect
79-
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
73+
go.opentelemetry.io/otel v1.35.0 // indirect
74+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
75+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect
76+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
77+
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
78+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
79+
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
8080
go.uber.org/multierr v1.11.0 // indirect
8181
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
8282
golang.org/x/net v0.38.0 // indirect
@@ -85,16 +85,18 @@ require (
8585
golang.org/x/text v0.23.0 // indirect
8686
golang.org/x/time v0.9.0 // indirect
8787
golang.org/x/tools v0.26.0 // indirect
88-
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
89-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
90-
google.golang.org/grpc v1.68.1 // indirect
88+
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
89+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect
90+
google.golang.org/grpc v1.72.1 // indirect
9191
google.golang.org/protobuf v1.36.5 // indirect
9292
gopkg.in/inf.v0 v0.9.1 // indirect
9393
gopkg.in/yaml.v3 v3.0.1 // indirect
94-
k8s.io/component-base v0.33.0 // indirect
94+
k8s.io/component-base v0.34.0-alpha.0 // indirect
9595
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
9696
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
9797
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
9898
sigs.k8s.io/randfill v1.0.0 // indirect
99-
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
99+
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
100100
)
101+
102+
replace k8s.io/client-go => k8s.io/client-go v0.0.0-20250603014204-647bbbe85970

0 commit comments

Comments
 (0)