Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ go 1.22.0
toolchain go1.22.3

replace (
// fix the latest working version for go.1.22
github.com/go-openapi/jsonreference => github.com/go-openapi/jsonreference v0.21.0
// fix the latest working version for go1.22
golang.org/x/exp => golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac
// fix CVE-2025-22869 with downstream tag v0.33.openshift.1
Expand Down
13 changes: 3 additions & 10 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -196,17 +196,11 @@ github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwds
github.com/go-openapi/jsonpointer v0.18.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg=
github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs=
github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY=
github.com/go-openapi/jsonpointer v0.22.0 h1:TmMhghgNef9YXxTu1tOopo+0BGEytxA+okbry0HjZsM=
github.com/go-openapi/jsonpointer v0.22.0/go.mod h1:xt3jV88UtExdIkkL7NloURjRQjbeUgcxFblMjq2iaiU=
github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
github.com/go-openapi/jsonreference v0.18.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc=
github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8=
github.com/go-openapi/jsonreference v0.20.1/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k=
github.com/go-openapi/jsonreference v0.21.1 h1:bSKrcl8819zKiOgxkbVNRUBIr6Wwj9KYrDbMjRs0cDA=
github.com/go-openapi/jsonreference v0.21.1/go.mod h1:PWs8rO4xxTUqKGu+lEvvCxD5k2X7QYkKAepJyCmSTT8=
github.com/go-openapi/jsonreference v0.21.0 h1:Rs+Y7hSXT83Jacb7kFyjn4ijOuVGSvOdF2+tg1TRrwQ=
github.com/go-openapi/jsonreference v0.21.0/go.mod h1:LmZmgsrTkVg9LG4EaHeY8cBDslNPMo06cago5JNLkm4=
github.com/go-openapi/loads v0.17.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
github.com/go-openapi/loads v0.18.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
github.com/go-openapi/loads v0.19.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
Expand All @@ -227,7 +221,6 @@ github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/
github.com/go-openapi/swag v0.18.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ=
github.com/go-openapi/swag v0.23.1 h1:lpsStH0n2ittzTnbaSloVZLuB5+fvSY/+hnagBjSNZU=
github.com/go-openapi/swag v0.23.1/go.mod h1:STZs8TbRvEQQKUA+JZNAm3EWlgaOBGpyFDqQnDHMef0=
Expand Down Expand Up @@ -594,6 +587,7 @@ github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40T
github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
Expand Down Expand Up @@ -649,7 +643,6 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
Expand Down
2 changes: 1 addition & 1 deletion kubelet
Submodule kubelet updated 37 files
+12 −0 pkg/features/kube_features.go
+14 −0 pkg/registry/core/rest/storage_core_generic.go
+1 −1 pkg/registry/core/serviceaccount/storage/storage_test.go
+18 −5 staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_handler.go
+3 −0 staging/src/k8s.io/apimachinery/pkg/api/meta/help.go
+20 −3 staging/src/k8s.io/apimachinery/pkg/runtime/serializer/codec_factory.go
+231 −0 staging/src/k8s.io/apimachinery/pkg/runtime/serializer/json/collections.go
+794 −0 staging/src/k8s.io/apimachinery/pkg/runtime/serializer/json/collections_test.go
+14 −2 staging/src/k8s.io/apimachinery/pkg/runtime/serializer/json/json.go
+174 −0 staging/src/k8s.io/apimachinery/pkg/runtime/serializer/protobuf/collections.go
+333 −0 staging/src/k8s.io/apimachinery/pkg/runtime/serializer/protobuf/collections_test.go
+73 −14 staging/src/k8s.io/apimachinery/pkg/runtime/serializer/protobuf/protobuf.go
+123 −4 staging/src/k8s.io/apimachinery/pkg/runtime/types_proto.go
+107 −0 staging/src/k8s.io/apimachinery/pkg/runtime/types_proto_test.go
+3 −3 staging/src/k8s.io/apiserver/pkg/admission/audit.go
+6 −6 staging/src/k8s.io/apiserver/pkg/admission/audit_test.go
+237 −29 staging/src/k8s.io/apiserver/pkg/audit/context.go
+38 −19 staging/src/k8s.io/apiserver/pkg/audit/context_test.go
+96 −111 staging/src/k8s.io/apiserver/pkg/audit/request.go
+362 −0 staging/src/k8s.io/apiserver/pkg/audit/request_log_test.go
+1 −5 staging/src/k8s.io/apiserver/pkg/authentication/token/cache/cached_token_authenticator.go
+4 −7 staging/src/k8s.io/apiserver/pkg/authentication/token/cache/cached_token_authenticator_test.go
+38 −67 staging/src/k8s.io/apiserver/pkg/endpoints/filters/audit.go
+174 −19 staging/src/k8s.io/apiserver/pkg/endpoints/filters/audit_test.go
+5 −8 staging/src/k8s.io/apiserver/pkg/endpoints/filters/authn_audit.go
+13 −3 staging/src/k8s.io/apiserver/pkg/endpoints/filters/authorization_test.go
+1 −2 staging/src/k8s.io/apiserver/pkg/endpoints/filters/impersonation.go
+6 −6 staging/src/k8s.io/apiserver/pkg/endpoints/filters/request_deadline.go
+15 −12 staging/src/k8s.io/apiserver/pkg/endpoints/filters/request_deadline_test.go
+4 −2 staging/src/k8s.io/apiserver/pkg/endpoints/handlers/delete_test.go
+54 −6 staging/src/k8s.io/apiserver/pkg/endpoints/handlers/responsewriters/writers.go
+366 −0 staging/src/k8s.io/apiserver/pkg/endpoints/handlers/responsewriters/writers_test.go
+12 −0 staging/src/k8s.io/apiserver/pkg/features/kube_features.go
+10 −3 staging/src/k8s.io/apiserver/pkg/server/config_test.go
+3 −5 staging/src/k8s.io/apiserver/pkg/server/filters/with_early_late_annotations_test.go
+11 −0 staging/src/k8s.io/apiserver/pkg/server/genericapiserver.go
+6 −9 staging/src/k8s.io/apiserver/pkg/util/x509metrics/server_cert_deprecations_test.go
120 changes: 53 additions & 67 deletions vendor/github.com/go-openapi/jsonreference/.golangci.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

69 changes: 35 additions & 34 deletions vendor/github.com/go-openapi/jsonreference/reference.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ github.com/go-logr/zapr
# github.com/go-openapi/jsonpointer v0.22.0
## explicit; go 1.20
github.com/go-openapi/jsonpointer
# github.com/go-openapi/jsonreference v0.21.1
# github.com/go-openapi/jsonreference v0.21.1 => github.com/go-openapi/jsonreference v0.21.0
## explicit; go 1.20
github.com/go-openapi/jsonreference
github.com/go-openapi/jsonreference/internal
Expand Down Expand Up @@ -1074,6 +1074,7 @@ sigs.k8s.io/structured-merge-diff/v4/value
## explicit; go 1.12
sigs.k8s.io/yaml
sigs.k8s.io/yaml/goyaml.v2
# github.com/go-openapi/jsonreference => github.com/go-openapi/jsonreference v0.21.0
# golang.org/x/exp => golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac
# golang/x/crypto => github.com/openshift/golang-crypto v0.33.1-0.20250310193910-9003f682e581
# k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff
Expand Down