Skip to content

Commit 165fcf6

Browse files
Merge remote-tracking branch 'origin/master' into release-1.34
Kubernetes-commit: c5d688bb1020431135dabe225e562052c0b296e3
1 parent 9aa646c commit 165fcf6

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

go.mod

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ require (
1717
go.opentelemetry.io/otel/sdk v1.34.0
1818
go.opentelemetry.io/otel/trace v1.35.0
1919
golang.org/x/net v0.38.0
20-
k8s.io/api v0.0.0-20250725104527-a5cc2d7de38d
21-
k8s.io/apimachinery v0.0.0-20250725024258-04507a37f6a4
22-
k8s.io/apiserver v0.0.0-20250727110300-7de8f16ff300
23-
k8s.io/client-go v0.0.0-20250725024918-f78361a6474d
24-
k8s.io/code-generator v0.0.0-20250725025733-9699fe1ce98e
25-
k8s.io/component-base v0.0.0-20250725025923-b9f1c2d98961
20+
k8s.io/api v0.0.0-20250816102306-133a39c86037
21+
k8s.io/apimachinery v0.0.0-20250816075726-b72d93d17433
22+
k8s.io/apiserver v0.0.0-20250816104935-04f597aa4329
23+
k8s.io/client-go v0.0.0-20250816102736-97396af4f440
24+
k8s.io/code-generator v0.0.0-20250816103827-c03f702f43c4
25+
k8s.io/component-base v0.0.0-20250816104031-4f4e85ff3f54
2626
k8s.io/klog/v2 v2.130.1
2727
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b
2828
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
@@ -108,7 +108,7 @@ require (
108108
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
109109
gopkg.in/yaml.v3 v3.0.1 // indirect
110110
k8s.io/gengo/v2 v2.0.0-20250604051438-85fd79dbfd9f // indirect
111-
k8s.io/kms v0.0.0-20250808195814-fdcaab077c28 // indirect
111+
k8s.io/kms v0.0.0-20250816104329-9899a8e225f9 // indirect
112112
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
113113
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
114114
sigs.k8s.io/yaml v1.6.0 // indirect

go.sum

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -276,24 +276,24 @@ gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYs
276276
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
277277
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
278278
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
279-
k8s.io/api v0.0.0-20250725104527-a5cc2d7de38d h1:npUrFEIOmw6SFkrK1xlj3TVrZGY1mXpxxkn801EBd4U=
280-
k8s.io/api v0.0.0-20250725104527-a5cc2d7de38d/go.mod h1:wKZv1VB6nzJ6L449TteVelrBfRsawhrthiOsEylKo8U=
281-
k8s.io/apimachinery v0.0.0-20250725024258-04507a37f6a4 h1:N25HX4lRPTvLHSUPoCMFP+B/oEcOmPESB+BRkYMD8Io=
282-
k8s.io/apimachinery v0.0.0-20250725024258-04507a37f6a4/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
283-
k8s.io/apiserver v0.0.0-20250727110300-7de8f16ff300 h1:abQRMiGUKVEU/iRMd6jVan34Y0KtG/PGN0+eQTlVtVg=
284-
k8s.io/apiserver v0.0.0-20250727110300-7de8f16ff300/go.mod h1:HdjLRZdWJdsmc2BaCdfSBiu3TEFNQF1lfWL7YL8pBcQ=
285-
k8s.io/client-go v0.0.0-20250725024918-f78361a6474d h1:8i9q3fd352G8FsurDLj4++5oMS4gWqZ5O2lErveG9Ok=
286-
k8s.io/client-go v0.0.0-20250725024918-f78361a6474d/go.mod h1:j4aKw1XACZSFUnRBqWNU0d3TXbXzaBhAbazCrGTYHdg=
287-
k8s.io/code-generator v0.0.0-20250725025733-9699fe1ce98e h1:xIcgxMk7abLdchUvuHOGpb4bl9hlD3MKxYyhzFtRv2c=
288-
k8s.io/code-generator v0.0.0-20250725025733-9699fe1ce98e/go.mod h1:hOF9HJDEnMzeiWVAV71QA3R14zK/zfwS5JZ/+YIbd3w=
289-
k8s.io/component-base v0.0.0-20250725025923-b9f1c2d98961 h1:gWZcTfCQXU9F1Yqzs0dRUxDKI6fxb+1hqrzd8XAP8y0=
290-
k8s.io/component-base v0.0.0-20250725025923-b9f1c2d98961/go.mod h1:+EKWDhmrFYENWq8vZZtJ9DvxEebCdVtSK4MGTw6CDuE=
279+
k8s.io/api v0.0.0-20250816102306-133a39c86037 h1:1TkkwH4RQbgEyFSdRQhjRFsReRUNRkWX44PjdTHC7cQ=
280+
k8s.io/api v0.0.0-20250816102306-133a39c86037/go.mod h1:lH4Pg8ye7aAjw/eEVA23Yix/PdEwoS/6mwXugx0o8zE=
281+
k8s.io/apimachinery v0.0.0-20250816075726-b72d93d17433 h1:PnxBv2aVdRFKtBihDGvDmF/VpvunGK8oo2eNO0GjghE=
282+
k8s.io/apimachinery v0.0.0-20250816075726-b72d93d17433/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
283+
k8s.io/apiserver v0.0.0-20250816104935-04f597aa4329 h1:KzI15ftNn3JwNank7vN+kiD+uOTngmxDEe9giqJyDuc=
284+
k8s.io/apiserver v0.0.0-20250816104935-04f597aa4329/go.mod h1:2o7l0eFXt+1/9pvED4VQAaGfDxG5OGrv6MHSLe59vU0=
285+
k8s.io/client-go v0.0.0-20250816102736-97396af4f440 h1:TvT+cBqBTvpw+vvwCEiklRGVKl0Sfiuvav7cZNxeb4I=
286+
k8s.io/client-go v0.0.0-20250816102736-97396af4f440/go.mod h1:e4f0WfgIKRvUFOmpOtbfjyIGcAgY6/gGVxwgfbc5ZgE=
287+
k8s.io/code-generator v0.0.0-20250816103827-c03f702f43c4 h1:lOF1zhFsSI2Ik4KS+INPttqR01ffEt65IEgrS487Wlg=
288+
k8s.io/code-generator v0.0.0-20250816103827-c03f702f43c4/go.mod h1:41tVeiFuMjzuAjzLXifxD9feV6F8S3LkszYyuXwaPCU=
289+
k8s.io/component-base v0.0.0-20250816104031-4f4e85ff3f54 h1:V+a0Y/tf6x8DRQWNSwG6i9AmzTVkkBk4mcAJZWBqTEo=
290+
k8s.io/component-base v0.0.0-20250816104031-4f4e85ff3f54/go.mod h1:x7HVgRQOvpvluq63ojPKqC2+21ncMMlFacN+iPczVYE=
291291
k8s.io/gengo/v2 v2.0.0-20250604051438-85fd79dbfd9f h1:SLb+kxmzfA87x4E4brQzB33VBbT2+x7Zq9ROIHmGn9Q=
292292
k8s.io/gengo/v2 v2.0.0-20250604051438-85fd79dbfd9f/go.mod h1:EJykeLsmFC60UQbYJezXkEsG2FLrt0GPNkU5iK5GWxU=
293293
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
294294
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
295-
k8s.io/kms v0.0.0-20250808195814-fdcaab077c28 h1:SaJZ90UgT9ZgjL6+LMnP3Wg46EYNAYqx3CDLNuyTJA4=
296-
k8s.io/kms v0.0.0-20250808195814-fdcaab077c28/go.mod h1:SKJNbZX2eJwX2/wmF4lZnp4nCVJXJ5Bx4N+SN/atd2g=
295+
k8s.io/kms v0.0.0-20250816104329-9899a8e225f9 h1:KoOV44phQb8zA7IDHUghx3dwLuqRyjxWcbBpgi11Vsw=
296+
k8s.io/kms v0.0.0-20250816104329-9899a8e225f9/go.mod h1:sn2N1cUOqWkUL4smHikc/Rllo+8t8qkRDaMlRM9vSns=
297297
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b h1:MloQ9/bdJyIu9lb1PzujOPolHyvO06MXG5TUIj2mNAA=
298298
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b/go.mod h1:UZ2yyWbFTpuhSbFhv24aGNOdoRdJZgsIObGBUaYVsts=
299299
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y=

0 commit comments

Comments
 (0)