Merge pull request #2153 from andyzhangx/CVE-2025-5187-1.25

[release-1.25] fix: CVE-2025-5187

Author: andyzhangx

go.mod

@@ -31,13 +31,13 @@ require (
 	google.golang.org/protobuf v1.36.3
 	k8s.io/api v0.32.1
 	k8s.io/apimachinery v0.32.1
-	k8s.io/apiserver v0.31.6
+	k8s.io/apiserver v0.31.12
 	k8s.io/client-go v0.32.1
-	k8s.io/component-base v0.31.6
+	k8s.io/component-base v0.31.12
 	k8s.io/klog/v2 v2.130.1
-	k8s.io/kubernetes v1.31.1
+	k8s.io/kubernetes v1.31.12
 	k8s.io/mount-utils v0.32.0
-	k8s.io/pod-security-admission v0.31.1
+	k8s.io/pod-security-admission v0.31.12
 	k8s.io/utils v0.0.0-20241210054802-24370beab758
 	sigs.k8s.io/cloud-provider-azure v1.30.1-0.20250125112532-472fe964b519
 	sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.5.9
@@ -160,49 +160,49 @@ require (
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/apiextensions-apiserver v0.0.0 // indirect
-	k8s.io/cloud-provider v0.31.6 // indirect
-	k8s.io/component-helpers v0.31.6 // indirect
-	k8s.io/controller-manager v0.31.6 // indirect
+	k8s.io/cloud-provider v0.31.12 // indirect
+	k8s.io/component-helpers v0.31.12 // indirect
+	k8s.io/controller-manager v0.31.12 // indirect
 	k8s.io/kms v0.32.0-alpha.0 // indirect
 	k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
 	k8s.io/kubectl v0.31.1 // indirect
-	k8s.io/kubelet v0.31.6 // indirect
+	k8s.io/kubelet v0.31.12 // indirect
 	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
 	sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
 )
 
 replace (
-	k8s.io/api => k8s.io/api v0.31.6
-	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.6
-	k8s.io/apimachinery => k8s.io/apimachinery v0.31.6
-	k8s.io/apiserver => k8s.io/apiserver v0.31.6
-	k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.6
-	k8s.io/client-go => k8s.io/client-go v0.31.6
-	k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.6
-	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.6
-	k8s.io/code-generator => k8s.io/code-generator v0.31.6
-	k8s.io/component-base => k8s.io/component-base v0.31.6
-	k8s.io/component-helpers => k8s.io/component-helpers v0.31.6
-	k8s.io/controller-manager => k8s.io/controller-manager v0.31.6
-	k8s.io/cri-api => k8s.io/cri-api v0.31.6
-	k8s.io/cri-client => k8s.io/cri-client v0.31.6
-	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.6
-	k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.31.6
-	k8s.io/endpointslice => k8s.io/endpointslice v0.31.6
-	k8s.io/kms => k8s.io/kms v0.31.6
-	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.6
-	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.6
-	k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.6
-	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.6
-	k8s.io/kubectl => k8s.io/kubectl v0.31.6
-	k8s.io/kubelet => k8s.io/kubelet v0.31.6
-	k8s.io/kubernetes => k8s.io/kubernetes v1.31.6
-	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.31.6
-	k8s.io/metrics => k8s.io/metrics v0.31.6
-	k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.6
-	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.6
-	k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.31.6
-	k8s.io/sample-controller => k8s.io/sample-controller v0.31.6
+	k8s.io/api => k8s.io/api v0.31.12
+	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.12
+	k8s.io/apimachinery => k8s.io/apimachinery v0.31.12
+	k8s.io/apiserver => k8s.io/apiserver v0.31.12
+	k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.12
+	k8s.io/client-go => k8s.io/client-go v0.31.12
+	k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.12
+	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.12
+	k8s.io/code-generator => k8s.io/code-generator v0.31.12
+	k8s.io/component-base => k8s.io/component-base v0.31.12
+	k8s.io/component-helpers => k8s.io/component-helpers v0.31.12
+	k8s.io/controller-manager => k8s.io/controller-manager v0.31.12
+	k8s.io/cri-api => k8s.io/cri-api v0.31.12
+	k8s.io/cri-client => k8s.io/cri-client v0.31.12
+	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.12
+	k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.31.12
+	k8s.io/endpointslice => k8s.io/endpointslice v0.31.12
+	k8s.io/kms => k8s.io/kms v0.31.12
+	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.12
+	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.12
+	k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.12
+	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.12
+	k8s.io/kubectl => k8s.io/kubectl v0.31.12
+	k8s.io/kubelet => k8s.io/kubelet v0.31.12
+	k8s.io/kubernetes => k8s.io/kubernetes v1.31.12
+	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.31.12
+	k8s.io/metrics => k8s.io/metrics v0.31.12
+	k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.12
+	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.12
+	k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.31.12
+	k8s.io/sample-controller => k8s.io/sample-controller v0.31.12
 	sigs.k8s.io/structured-merge-diff/v4 => sigs.k8s.io/structured-merge-diff/v4 v4.4.1
 )

go.sum

@@ -432,42 +432,42 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-k8s.io/api v0.31.6 h1:ocWG/UhC9Mqp5oEfYWy9wCddbZiZyBAFTlBt0LVlhDg=
-k8s.io/api v0.31.6/go.mod h1:i16xSiKMgVIVhsJMxfWq0mJbXA+Z7KhjPgYmwT41hl4=
-k8s.io/apiextensions-apiserver v0.31.6 h1:v9sqyWlrgFZpAPdEb/bEiXfM98TfSppwRF0X/uWKXh0=
-k8s.io/apiextensions-apiserver v0.31.6/go.mod h1:QVH3CFwqzGZtwsxPYzJlA/Qiwgb5FXmRMGls3CjzvbI=
-k8s.io/apimachinery v0.31.6 h1:Pn96A0wHD0X8+l7QTdAzdLQPrpav1s8rU6A+v2/9UEY=
-k8s.io/apimachinery v0.31.6/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
-k8s.io/apiserver v0.31.6 h1:FEhEGLsz1PbMOHeQZDbOUlMh36zRZbjgKwJCoMhdGmw=
-k8s.io/apiserver v0.31.6/go.mod h1:dpFh+xqFQ02O8vLYCIqoiV7sJIpZsUULeNuag6Y9HGo=
-k8s.io/client-go v0.31.6 h1:51HT40qVIZ13BrHKeWxFuU52uoPnFhxTYJnv4+LTgp4=
-k8s.io/client-go v0.31.6/go.mod h1:MEq7JQJelUQ0/4fMoPEUrc/OOFyGo/9LmGA38H6O6xY=
-k8s.io/cloud-provider v0.31.6 h1:5vVMyf/m/n8ij/GmSJLRcatchmciRr0gs4peBcxqvKk=
-k8s.io/cloud-provider v0.31.6/go.mod h1:iT6kIEMEXrTIvRBAaRU5qefRzgPaSV6kwTc6mjhhnEw=
-k8s.io/component-base v0.31.6 h1:FgI25PuZtCp2n7AFpOaDpMQOLieFdrpAbpeoZu7VhDI=
-k8s.io/component-base v0.31.6/go.mod h1:aVRrh8lAI1kSShFmwcKLhc3msQoUcmFWPBDf0sXaISM=
-k8s.io/component-helpers v0.31.6 h1:Af8BcE6pElKlLaerwW9s04jTQVFa66wmI1pkaNfDWzE=
-k8s.io/component-helpers v0.31.6/go.mod h1:6CRV6M+7R13eqtz4FBm2ty9eH+QajDcP3y0Bklzh2FA=
-k8s.io/controller-manager v0.31.6 h1:HQRUV6nogHo2N7vr3cgVNjZ+wvHIMvxEMjTeCrHitE4=
-k8s.io/controller-manager v0.31.6/go.mod h1:0HDNTZVapQFa9G96jNxrU99ht7fQJVEKBXDzqKDMez0=
-k8s.io/csi-translation-lib v0.31.6 h1:mBkF3AG8pRcwZv8SY7qT1JWznRsmYjZfT5Lxel9nN4Q=
-k8s.io/csi-translation-lib v0.31.6/go.mod h1:I2F51irYJyt78so7wdral65B7PB7jR3keZ2MpB78mWw=
+k8s.io/api v0.31.12 h1:yysm83xHIoKAwfm2w0dT6Yz7vfWzl841AEMI7Y8wDa8=
+k8s.io/api v0.31.12/go.mod h1:f/srhhI7aDs9K4s0W1GX4/zb+cIf5uWrBjGyoO/XgJc=
+k8s.io/apiextensions-apiserver v0.31.12 h1:d32I3VReAly5Qoc9ZXhO4/iObYmm7Jk6VvAeRAbg/MA=
+k8s.io/apiextensions-apiserver v0.31.12/go.mod h1:KcBI/Z/WQmbffBwfqQmqHhALhvun5JNJJh8Y29CJwUo=
+k8s.io/apimachinery v0.31.12 h1:y34W8rNKc+jDxUvEXarjahqM6vOV5iqgZPuRqRuyEh8=
+k8s.io/apimachinery v0.31.12/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
+k8s.io/apiserver v0.31.12 h1:W5hKS78HC/llxTLBICR/xXScPkc5sPkDA66pyAin+mQ=
+k8s.io/apiserver v0.31.12/go.mod h1:f0EWMQvAmOfNBrYYVesqnQFrfMyDYlxVUOLm/RNDbP8=
+k8s.io/client-go v0.31.12 h1:JJhouOoU1bKdPWplkZ2CpYA74+lxj3Zsn15aoGLX6Hk=
+k8s.io/client-go v0.31.12/go.mod h1:kjQ5WSec9ShP3T1auTDFW4bTqgmJdBuZPsjq5FqeuYE=
+k8s.io/cloud-provider v0.31.12 h1:la9A7dGy0VpcnI5nNZ7/RhU4/0ZoAVx6QM6T+Lze96s=
+k8s.io/cloud-provider v0.31.12/go.mod h1:VKHFFjRqXQNryOxbW+xE/0tL8qm8ejxaQ0t3TRA2AMc=
+k8s.io/component-base v0.31.12 h1:Z7SYHg782bY1NLGezTJYRZGPeywWVtFpE35iOEam//4=
+k8s.io/component-base v0.31.12/go.mod h1:r6wrhZ7BrjAUhGZttUT6MNJdn0McPWF5RPz/xcQY3xI=
+k8s.io/component-helpers v0.31.12 h1:Mb9/Ijz0euQQ2v2IEgtKkvWBbDeMTq2fqHs1OoXPxGM=
+k8s.io/component-helpers v0.31.12/go.mod h1:62Zm0UNTFymcAUItaHCL+g9Qbco1WcSuiUvVSKEQtvk=
+k8s.io/controller-manager v0.31.12 h1:wrRs4CWP2ZtL5JnyW9QaTgD9DB1YQI7Sr68ifKF9n+M=
+k8s.io/controller-manager v0.31.12/go.mod h1:6EIutOXkyduBppAJuIpDTCr5lJPEMtD2gPLL4jE9W+E=
+k8s.io/csi-translation-lib v0.31.12 h1:SYouspmYCx0y2TQU6Hl4uLG3Pb4esPSwv2p6vmFK1IM=
+k8s.io/csi-translation-lib v0.31.12/go.mod h1:CHOkTS6J9u88oAXt99sOse6zLjIRyFdiAjQsNt6Rg+c=
 k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
 k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
-k8s.io/kms v0.31.6 h1:p7OY+9Hp8nPtgzm0vT9TrERNigQQSu8tkgWqn+GvB2w=
-k8s.io/kms v0.31.6/go.mod h1:OZKwl1fan3n3N5FFxnW5C4V3ygrah/3YXeJWS3O6+94=
+k8s.io/kms v0.31.12 h1:1YVbrlxjwG15c3rU4MYUUzCmFNII+tA46EBHWGWD4zY=
+k8s.io/kms v0.31.12/go.mod h1:OZKwl1fan3n3N5FFxnW5C4V3ygrah/3YXeJWS3O6+94=
 k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJJ4JRdzg3+O6e8I+e+8T5Y=
 k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f/go.mod h1:R/HEjbvWI0qdfb8viZUeVZm0X6IZnxAydC7YU42CMw4=
-k8s.io/kubectl v0.31.6 h1:ngzql/UugqpEbeeyQX678BlVHXks19JR3CFjwKnWuFI=
-k8s.io/kubectl v0.31.6/go.mod h1:m6OXbx9s0sZiaZrfHHSEmJUD5CjWPA5+cVg0GZnVdzM=
-k8s.io/kubelet v0.31.6 h1:lxVvyLNDcb/QTpQNkDySk3iscgq4zubeSZs3cF6PmaA=
-k8s.io/kubelet v0.31.6/go.mod h1:BPghO52ilF7UzFEVBmYFOxdVtLge0P1gixjz84lBzzc=
-k8s.io/kubernetes v1.31.6 h1:zVhgWDFHmIj51o5sNARmjdgNvpq4K2Smya8pS5vxqlc=
-k8s.io/kubernetes v1.31.6/go.mod h1:9xmT2buyTYj8TRKwRae7FcuY8k5+xlxv7VivvO0KKfs=
+k8s.io/kubectl v0.31.12 h1:+f0KlQcVYX/7J7ii0AGRwCZYVx55u4dOj3Irrh17Daw=
+k8s.io/kubectl v0.31.12/go.mod h1:BbqRvKt1mdJLdk+0Qovx38/d2MCLwTA31I8IN+Fql1s=
+k8s.io/kubelet v0.31.12 h1:iSaYgKgLig52YOqsu+3wIXq/p++sawwQM59D7t0gIgQ=
+k8s.io/kubelet v0.31.12/go.mod h1:lOqTjK7k1wmGMPanLMykpEYYyfjNgCu9EDG6kYqu2Jc=
+k8s.io/kubernetes v1.31.12 h1:dPgK1slI7p/D3I2J1NA6UfBeMMHcjB91rHdXMpx8fkU=
+k8s.io/kubernetes v1.31.12/go.mod h1:9xmT2buyTYj8TRKwRae7FcuY8k5+xlxv7VivvO0KKfs=
 k8s.io/mount-utils v0.32.0 h1:KOQAhPzJICATXnc6XCkWoexKbkOexRnMCUW8APFfwg4=
 k8s.io/mount-utils v0.32.0/go.mod h1:Kun5c2svjAPx0nnvJKYQWhfeNW+O0EpzHgRhDcYoSY0=
-k8s.io/pod-security-admission v0.31.6 h1:5WnXyl+UNmQb73O0L1w82uaUEPuvp+sxdhXRiOLdCkY=
-k8s.io/pod-security-admission v0.31.6/go.mod h1:b+ZpSSR+XMx3t9Pvy/GdcXoI0CEpiWGT7IGAhcOBcGM=
+k8s.io/pod-security-admission v0.31.12 h1:lL+0Mn2MqTdFqgRPo0u+nO9/GhaBB/MrOxJLILw3oO4=
+k8s.io/pod-security-admission v0.31.12/go.mod h1:PpqjhNzLvSwjCQ8aufbVGWPZb2gtB226rnQc0tS8gHM=
 k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJJI8IUa1AmH/qa0=
 k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 h1:2770sDpzrjjsAtVhSeUFseziht227YAWYHLGNM8QPwY=