Skip to content

Commit d590604

Browse files
authored
Merge branch 'main' into konflux/mintmaker/main/k8s.io-kube-openapi-digest
2 parents 39591c1 + f23f06e commit d590604

File tree

7 files changed

+95
-33
lines changed

7 files changed

+95
-33
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ require (
3131
k8s.io/apimachinery v0.30.3
3232
k8s.io/client-go v1.5.2
3333
k8s.io/klog/v2 v2.130.1
34-
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
34+
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
3535
knative.dev/pkg v0.0.0-20240416145024-0f34a8815650
3636
sigs.k8s.io/controller-runtime v0.17.5
3737
)
@@ -134,7 +134,7 @@ require (
134134
k8s.io/component-base v0.29.3 // indirect
135135
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
136136
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect
137-
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
137+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
138138
sigs.k8s.io/randfill v1.0.0 // indirect
139139
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
140140
sigs.k8s.io/structured-merge-diff/v6 v6.2.0 // indirect

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -784,8 +784,8 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 h1:TgtAeesdhpm2S
784784
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0/go.mod h1:VHVDI/KrK4fjnV61bE2g3sA7tiETLn8sooImelsCx3Y=
785785
sigs.k8s.io/controller-runtime v0.17.5 h1:1FI9Lm7NiOOmBsgTV36/s2XrEFXnO2C4sbg/Zme72Rw=
786786
sigs.k8s.io/controller-runtime v0.17.5/go.mod h1:N0jpP5Lo7lMTF9aL56Z/B2oWBJjey6StQM0jRbKQXtY=
787-
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
788-
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
787+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5EXP7sU1kvOlxwZh5txg=
788+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
789789
sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
790790
sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=
791791
sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=

vendor/k8s.io/utils/net/multi_listen.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1010,7 +1010,7 @@ k8s.io/kube-openapi/pkg/schemaconv
10101010
k8s.io/kube-openapi/pkg/spec3
10111011
k8s.io/kube-openapi/pkg/util/proto
10121012
k8s.io/kube-openapi/pkg/validation/spec
1013-
# k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
1013+
# k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
10141014
## explicit; go 1.18
10151015
k8s.io/utils/buffer
10161016
k8s.io/utils/clock
@@ -1103,7 +1103,7 @@ sigs.k8s.io/controller-runtime/pkg/webhook
11031103
sigs.k8s.io/controller-runtime/pkg/webhook/admission
11041104
sigs.k8s.io/controller-runtime/pkg/webhook/conversion
11051105
sigs.k8s.io/controller-runtime/pkg/webhook/internal/metrics
1106-
# sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8
1106+
# sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730
11071107
## explicit; go 1.23
11081108
sigs.k8s.io/json
11091109
sigs.k8s.io/json/internal/golang/encoding/json

vendor/sigs.k8s.io/json/internal/golang/encoding/json/decode.go

Lines changed: 25 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/sigs.k8s.io/json/internal/golang/encoding/json/encode.go

Lines changed: 59 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/sigs.k8s.io/json/internal/golang/encoding/json/stream.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)