Skip to content

Commit f72cc5c

Browse files
Merge pull request #115642 from nckturner/pin-golang.org/x/net-to-v0.4.0-in-1.26
Pin golang.org/x/net to v0.4.0 in 1.26 Kubernetes-commit: 5ae2e75abe3a631e770b7136f8e3bd2a6051ba18
1 parent 28eb995 commit f72cc5c

File tree

2 files changed

+28
-15
lines changed

2 files changed

+28
-15
lines changed

go.mod

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ require (
2323
google.golang.org/grpc v1.49.0
2424
google.golang.org/protobuf v1.28.1
2525
gopkg.in/yaml.v2 v2.4.0
26-
k8s.io/api v0.0.0
27-
k8s.io/apimachinery v0.0.0
28-
k8s.io/apiserver v0.0.0
29-
k8s.io/client-go v0.0.0
30-
k8s.io/code-generator v0.0.0
31-
k8s.io/component-base v0.0.0
26+
k8s.io/api v0.0.0-20230210143906-1c6bd7031bcf
27+
k8s.io/apimachinery v0.0.0-20230210142156-eabbfd57b6c3
28+
k8s.io/apiserver v0.0.0-20230210165428-05e39c775240
29+
k8s.io/client-go v0.0.0-20230210153645-2e3434888bb3
30+
k8s.io/code-generator v0.0.0-20230210135354-73b9c40d1bb5
31+
k8s.io/component-base v0.0.0-20230210155927-2dcbf9413284
3232
k8s.io/klog/v2 v2.80.1
3333
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280
3434
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d
@@ -120,17 +120,16 @@ require (
120120
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
121121
gopkg.in/yaml.v3 v3.0.1 // indirect
122122
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
123-
k8s.io/kms v0.0.0 // indirect
123+
k8s.io/kms v0.0.0-20230210162116-4dbde34ed1c6 // indirect
124124
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.35 // indirect
125125
)
126126

127127
replace (
128-
k8s.io/api => ../api
129-
k8s.io/apiextensions-apiserver => ../apiextensions-apiserver
130-
k8s.io/apimachinery => ../apimachinery
131-
k8s.io/apiserver => ../apiserver
132-
k8s.io/client-go => ../client-go
133-
k8s.io/code-generator => ../code-generator
134-
k8s.io/component-base => ../component-base
135-
k8s.io/kms => ../kms
128+
k8s.io/api => k8s.io/api v0.0.0-20230210143906-1c6bd7031bcf
129+
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230210142156-eabbfd57b6c3
130+
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20230210165428-05e39c775240
131+
k8s.io/client-go => k8s.io/client-go v0.0.0-20230210153645-2e3434888bb3
132+
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20230210135354-73b9c40d1bb5
133+
k8s.io/component-base => k8s.io/component-base v0.0.0-20230210155927-2dcbf9413284
134+
k8s.io/kms => k8s.io/kms v0.0.0-20230210162116-4dbde34ed1c6
136135
)

go.sum

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -869,11 +869,25 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
869869
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
870870
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
871871
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
872+
k8s.io/api v0.0.0-20230210143906-1c6bd7031bcf h1:9xPQVVAQ6dBWeQhmtmP4oNF0X7bC6ei5Ek7RrFzyBnQ=
873+
k8s.io/api v0.0.0-20230210143906-1c6bd7031bcf/go.mod h1:nbJ6QmNQBibrap0HTOvWFJKxGK/BrzYLsHxUzTeQVmk=
874+
k8s.io/apimachinery v0.0.0-20230210142156-eabbfd57b6c3 h1:RN3IQSPP01c+YjfkiCORSIyDxHiZ5MnjUJEczkgihis=
875+
k8s.io/apimachinery v0.0.0-20230210142156-eabbfd57b6c3/go.mod h1:HWHg+XOdXb6/tSnEPcCnHox2Q9pEHVBOoy/uDTqdD2U=
876+
k8s.io/apiserver v0.0.0-20230210165428-05e39c775240 h1:izz6B6dCUA/kgSF5F7+vbeYI/UazQeBiIYOZpgJkvjk=
877+
k8s.io/apiserver v0.0.0-20230210165428-05e39c775240/go.mod h1:4mR+h14ymvMXcfzzz65SktrBd8tFG2Ffmm4GCpUQbsw=
878+
k8s.io/client-go v0.0.0-20230210153645-2e3434888bb3 h1:ULD2jmZv0ad5l+sY40V19QSmSIJo8g/1vd8zz9yuX8c=
879+
k8s.io/client-go v0.0.0-20230210153645-2e3434888bb3/go.mod h1:F0c5iAdVOmjB4/PrZUBO53STxj5j3DE6g4xOn/o/WUY=
880+
k8s.io/code-generator v0.0.0-20230210135354-73b9c40d1bb5 h1:fvEVZy+FZh+Hhf3l5Smkx7VKneNeJG+57eeZ3K3AQLo=
881+
k8s.io/code-generator v0.0.0-20230210135354-73b9c40d1bb5/go.mod h1:3FVkQhSrz/EnijH2QGOWPfIbWCf5QyTZ3CAiTdt74jM=
882+
k8s.io/component-base v0.0.0-20230210155927-2dcbf9413284 h1:Wyx2zUTgx24uE38TvovTGFw+bGhQQXsOyIHeur5/pT8=
883+
k8s.io/component-base v0.0.0-20230210155927-2dcbf9413284/go.mod h1:3Vr9lpWind8jJlqQjSNyw43+mk5QmPcLmDFJnxtIvGc=
872884
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d h1:U9tB195lKdzwqicbJvyJeOXV7Klv+wNAWENRnXEGi08=
873885
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
874886
k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
875887
k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4=
876888
k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
889+
k8s.io/kms v0.0.0-20230210162116-4dbde34ed1c6 h1:9xslyqSMagcgKRC8qpDC0/chyq0jwYDC4FjDEdAHul8=
890+
k8s.io/kms v0.0.0-20230210162116-4dbde34ed1c6/go.mod h1:ts2SCIYR8JHLU6G4a/j6vkj99DTHGzJpOCJOZYydrpM=
877891
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+OGxg8HsuBr/5f6tVAjDu6E=
878892
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4=
879893
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d h1:0Smp/HP1OH4Rvhe+4B8nWGERtlqAGSftbSbbmm45oFs=

0 commit comments

Comments
 (0)