Skip to content
Open
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
5 changes: 5 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,17 @@ go 1.23.0
toolchain go1.23.5

replace (
// fix version to prevent upgrade to 1.24
github.com/go-openapi/jsonpointer => github.com/go-openapi/jsonpointer v0.22.0
// fix version to prevent upgrade to 1.24
github.com/go-openapi/jsonreference => github.com/go-openapi/jsonreference v0.20.4
// fix CVE-2025-30204 transitive deps still using older v4. Remove once `go mod graph` shows only 4.5.2 or higher
github.com/golang-jwt/jwt/v4 => github.com/golang-jwt/jwt/v4 v4.5.2
github.com/golang-jwt/jwt/v5 => github.com/golang-jwt/jwt/v5 v5.2.2

// pin kube-openapi to pre structured-merge-diff/v6 to resolve apimachinery type mismatch
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20250628140032-d90c4fd18f59

)

require (
Expand Down
20 changes: 5 additions & 15 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -212,21 +212,10 @@ github.com/go-openapi/analysis v0.19.5/go.mod h1:hkEAkxagaIvIP7VTn8ygJNkd4kAYON2
github.com/go-openapi/errors v0.17.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0=
github.com/go-openapi/errors v0.18.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0=
github.com/go-openapi/errors v0.19.2/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94=
github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
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.20.4 h1:bKlDxQxQJgwpUSgOENiMPzCTBVuc7vTdXSSgNeAhojU=
github.com/go-openapi/jsonreference v0.20.4/go.mod h1:5pZJyJP2MnYCpoeoMAql78cCHauHj0V9Lhc506VOpw4=
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 @@ -247,7 +236,7 @@ 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.22.6/go.mod h1:Gl91UqO+btAM0plGGxHqJcQZ1ZTy6jbmridBTsDy8A0=
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 @@ -447,7 +436,6 @@ github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czP
github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs=
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
github.com/mailru/easyjson v0.9.1 h1:LbtsOm5WAswyWbvTEOqhypdPeZzHavpZx96/n553mR8=
Expand Down Expand Up @@ -617,6 +605,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/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
Expand Down Expand Up @@ -678,6 +667,7 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
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.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
Expand Down
2 changes: 1 addition & 1 deletion kubelet
Submodule kubelet updated 35 files
+1 −1 .go-version
+214 −84 CHANGELOG/CHANGELOG-1.32.md
+1 −1 build/build-image/cross/VERSION
+2 −2 build/common.sh
+4 −4 build/dependencies.yaml
+5 −0 cmd/kubeadm/app/util/config/initconfiguration.go
+1 −1 openshift-hack/images/hyperkube/Dockerfile.rhel
+8 −0 pkg/features/kube_features.go
+8 −0 pkg/features/versioned_kube_features.go
+11 −1 pkg/registry/core/rest/storage_core_generic.go
+31 −16 pkg/securitycontext/util.go
+21 −0 pkg/securitycontext/util_darwin.go
+74 −0 pkg/securitycontext/util_linux.go
+2 −2 pkg/securitycontext/util_test.go
+21 −0 pkg/securitycontext/util_windows.go
+6 −7 pkg/volume/plugins.go
+1 −1 staging/publishing/rules.yaml
+13 −3 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
+230 −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
+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
+16 −0 staging/src/k8s.io/apiserver/pkg/features/kube_features.go
+11 −1 staging/src/k8s.io/apiserver/pkg/server/genericapiserver.go
+12 −0 test/featuregates_linter/test_data/versioned_feature_list.yaml
+1 −1 test/images/Makefile
+1 −1 test/utils/image/manifest.go
2 changes: 1 addition & 1 deletion ovn-kubernetes
Submodule ovn-kubernetes updated 83 files
+1 −1 .github/workflows/test.yml
+3 −1 Dockerfile.base
+64 −1 dist/images/ovnkube.sh
+23 −3 go-controller/cmd/ovnkube/ovnkube.go
+2 −2 go-controller/pkg/allocator/pod/pod_annotation.go
+7 −7 go-controller/pkg/clustermanager/clustermanager.go
+4 −4 go-controller/pkg/clustermanager/network_cluster_controller.go
+3 −3 go-controller/pkg/clustermanager/node/node_allocator.go
+12 −12 go-controller/pkg/clustermanager/user_defined_network_cluster_manager.go
+15 −15 go-controller/pkg/clustermanager/user_defined_network_unit_test.go
+1 −1 go-controller/pkg/cni/helper_linux.go
+1 −1 go-controller/pkg/cni/types.go
+1 −1 go-controller/pkg/cni/utils.go
+8 −8 go-controller/pkg/controllermanager/controller_manager.go
+43 −11 go-controller/pkg/controllermanager/node_controller_manager.go
+72 −0 go-controller/pkg/libovsdb/util/northd_sync.go
+4 −4 go-controller/pkg/metrics/ovnkube_controller.go
+1 −1 go-controller/pkg/node/base_node_network_controller_dpu.go
+17 −0 go-controller/pkg/node/bridgeconfig/bridgeconfig.go
+88 −6 go-controller/pkg/node/bridgeconfig/bridgeflows.go
+15 −22 go-controller/pkg/node/controllers/egressip/egressip.go
+10 −6 go-controller/pkg/node/default_node_network_controller.go
+3 −32 go-controller/pkg/node/egressip/gateway_egressip.go
+36 −40 go-controller/pkg/node/egressip/gateway_egressip_test.go
+10 −0 go-controller/pkg/node/gateway.go
+1 −1 go-controller/pkg/node/node_ip_handler_linux.go
+9 −0 go-controller/pkg/node/openflow_manager.go
+4 −0 go-controller/pkg/node/types/const.go
+16 −16 go-controller/pkg/node/user_defined_node_network_controller.go
+8 −8 go-controller/pkg/node/user_defined_node_network_controller_test.go
+14 −14 go-controller/pkg/ovn/base_network_controller.go
+1 −1 go-controller/pkg/ovn/base_network_controller_multicast.go
+2 −2 go-controller/pkg/ovn/base_network_controller_multipolicy.go
+2 −2 go-controller/pkg/ovn/base_network_controller_namespace.go
+35 −29 go-controller/pkg/ovn/base_network_controller_pods.go
+38 −0 go-controller/pkg/ovn/base_network_controller_pods_test.go
+5 −5 go-controller/pkg/ovn/base_network_controller_policy.go
+47 −47 go-controller/pkg/ovn/base_network_controller_user_defined.go
+6 −6 go-controller/pkg/ovn/base_network_controller_user_defined_test.go
+13 −13 go-controller/pkg/ovn/base_secondary_layer2_network_controller.go
+0 −1 go-controller/pkg/ovn/controller/admin_network_policy/admin_network_policy_controller.go
+2 −2 go-controller/pkg/ovn/controller/network_qos/network_qos.go
+1 −1 go-controller/pkg/ovn/controller/network_qos/network_qos_ovnnb.go
+3 −3 go-controller/pkg/ovn/controller/network_qos/network_qos_test.go
+9 −5 go-controller/pkg/ovn/default_network_controller.go
+182 −93 go-controller/pkg/ovn/egressip.go
+1,851 −148 go-controller/pkg/ovn/egressip_test.go
+29 −29 go-controller/pkg/ovn/egressip_udn_l2_test.go
+43 −43 go-controller/pkg/ovn/egressip_udn_l3_test.go
+1 −1 go-controller/pkg/ovn/external_ids_syncer/logical_router_policy/logical_router_policy_sync.go
+1 −1 go-controller/pkg/ovn/external_ids_syncer/nat/nat_sync.go
+21 −21 go-controller/pkg/ovn/gateway.go
+1 −1 go-controller/pkg/ovn/gatewayrouter/policybasedroutes.go
+1 −1 go-controller/pkg/ovn/gatewayrouter/policybasedroutes_test.go
+177 −17 go-controller/pkg/ovn/kubevirt_test.go
+63 −63 go-controller/pkg/ovn/layer2_user_defined_network_controller.go
+49 −49 go-controller/pkg/ovn/layer2_user_defined_network_controller_test.go
+60 −60 go-controller/pkg/ovn/layer3_user_defined_network_controller.go
+48 −48 go-controller/pkg/ovn/layer3_user_defined_network_controller_test.go
+51 −51 go-controller/pkg/ovn/localnet_user_defined_network_controller.go
+2 −2 go-controller/pkg/ovn/multicast_test.go
+22 −22 go-controller/pkg/ovn/multihoming_test.go
+45 −45 go-controller/pkg/ovn/multipolicy_test.go
+19 −7 go-controller/pkg/ovn/ovn.go
+29 −29 go-controller/pkg/ovn/ovn_test.go
+17 −0 go-controller/pkg/ovn/pods.go
+20 −20 go-controller/pkg/ovn/pods_test.go
+3 −3 go-controller/pkg/ovn/port_cache.go
+3 −3 go-controller/pkg/ovn/topology/topologyfactory.go
+8 −8 go-controller/pkg/ovn/zone_interconnect/zone_ic_handler.go
+1 −1 go-controller/pkg/ovn/zone_interconnect/zone_ic_handler_test.go
+3 −3 go-controller/pkg/types/const.go
+39 −0 go-controller/pkg/util/egressip/net.go
+2 −2 go-controller/pkg/util/mocks/multinetwork/NetInfo.go
+68 −68 go-controller/pkg/util/multi_network.go
+2 −2 go-controller/pkg/util/multi_network_test.go
+1 −1 go-controller/pkg/util/pod_annotation.go
+5 −5 go-controller/pkg/util/util.go
+3 −3 test/e2e/kubevirt.go
+417 −163 test/e2e/multihoming.go
+428 −0 test/e2e/multihoming_external_router_utils.go
+44 −13 test/e2e/multihoming_utils.go
+215 −0 test/e2e/util.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.

8 changes: 5 additions & 3 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -173,11 +173,11 @@ github.com/go-logr/stdr
# github.com/go-logr/zapr v1.3.0
## explicit; go 1.18
github.com/go-logr/zapr
# github.com/go-openapi/jsonpointer v0.22.0
# github.com/go-openapi/jsonpointer v0.22.0 => 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
## explicit; go 1.20
# github.com/go-openapi/jsonreference v0.21.1 => github.com/go-openapi/jsonreference v0.20.4
## explicit; go 1.19
github.com/go-openapi/jsonreference
github.com/go-openapi/jsonreference/internal
# github.com/go-openapi/swag v0.23.1
Expand Down Expand Up @@ -1466,6 +1466,8 @@ sigs.k8s.io/structured-merge-diff/v4/value
sigs.k8s.io/yaml
sigs.k8s.io/yaml/goyaml.v2
sigs.k8s.io/yaml/goyaml.v3
# github.com/go-openapi/jsonpointer => github.com/go-openapi/jsonpointer v0.22.0
# github.com/go-openapi/jsonreference => github.com/go-openapi/jsonreference v0.20.4
# github.com/golang-jwt/jwt/v4 => github.com/golang-jwt/jwt/v4 v4.5.2
# github.com/golang-jwt/jwt/v5 => github.com/golang-jwt/jwt/v5 v5.2.2
# k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20250628140032-d90c4fd18f59