Skip to content

Commit 4f4e85f

Browse files
Merge remote-tracking branch 'origin/master' into release-1.34
Kubernetes-commit: c5d688bb1020431135dabe225e562052c0b296e3
1 parent b463ee1 commit 4f4e85f

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ require (
2828
go.uber.org/zap v1.27.0
2929
go.yaml.in/yaml/v2 v2.4.2
3030
golang.org/x/sys v0.31.0
31-
k8s.io/apimachinery v0.0.0-20250725024258-04507a37f6a4
32-
k8s.io/client-go v0.0.0-20250725024918-f78361a6474d
31+
k8s.io/apimachinery v0.0.0-20250816075726-b72d93d17433
32+
k8s.io/client-go v0.0.0-20250816102736-97396af4f440
3333
k8s.io/klog/v2 v2.130.1
3434
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
3535
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8
@@ -80,7 +80,7 @@ require (
8080
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
8181
gopkg.in/inf.v0 v0.9.1 // indirect
8282
gopkg.in/yaml.v3 v3.0.1 // indirect
83-
k8s.io/api v0.0.0-20250725024535-b95b43d5b95d // indirect
83+
k8s.io/api v0.0.0-20250816102306-133a39c86037 // indirect
8484
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
8585
sigs.k8s.io/randfill v1.0.0 // indirect
8686
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect

go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -210,12 +210,12 @@ gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
210210
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
211211
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
212212
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
213-
k8s.io/api v0.0.0-20250725024535-b95b43d5b95d h1:OdC1L69BYvh/4HX6Wgg7DeL0A++gD3gadKfaWT4IdbA=
214-
k8s.io/api v0.0.0-20250725024535-b95b43d5b95d/go.mod h1:wKZv1VB6nzJ6L449TteVelrBfRsawhrthiOsEylKo8U=
215-
k8s.io/apimachinery v0.0.0-20250725024258-04507a37f6a4 h1:N25HX4lRPTvLHSUPoCMFP+B/oEcOmPESB+BRkYMD8Io=
216-
k8s.io/apimachinery v0.0.0-20250725024258-04507a37f6a4/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
217-
k8s.io/client-go v0.0.0-20250725024918-f78361a6474d h1:8i9q3fd352G8FsurDLj4++5oMS4gWqZ5O2lErveG9Ok=
218-
k8s.io/client-go v0.0.0-20250725024918-f78361a6474d/go.mod h1:j4aKw1XACZSFUnRBqWNU0d3TXbXzaBhAbazCrGTYHdg=
213+
k8s.io/api v0.0.0-20250816102306-133a39c86037 h1:1TkkwH4RQbgEyFSdRQhjRFsReRUNRkWX44PjdTHC7cQ=
214+
k8s.io/api v0.0.0-20250816102306-133a39c86037/go.mod h1:lH4Pg8ye7aAjw/eEVA23Yix/PdEwoS/6mwXugx0o8zE=
215+
k8s.io/apimachinery v0.0.0-20250816075726-b72d93d17433 h1:PnxBv2aVdRFKtBihDGvDmF/VpvunGK8oo2eNO0GjghE=
216+
k8s.io/apimachinery v0.0.0-20250816075726-b72d93d17433/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
217+
k8s.io/client-go v0.0.0-20250816102736-97396af4f440 h1:TvT+cBqBTvpw+vvwCEiklRGVKl0Sfiuvav7cZNxeb4I=
218+
k8s.io/client-go v0.0.0-20250816102736-97396af4f440/go.mod h1:e4f0WfgIKRvUFOmpOtbfjyIGcAgY6/gGVxwgfbc5ZgE=
219219
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
220220
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
221221
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b h1:MloQ9/bdJyIu9lb1PzujOPolHyvO06MXG5TUIj2mNAA=

0 commit comments

Comments
 (0)