Skip to content

Commit 71a35b6

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 8a2258e commit 71a35b6

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
@@ -7,11 +7,11 @@ go 1.19
77
require (
88
github.com/google/gofuzz v1.1.0
99
github.com/spf13/cobra v1.6.0
10-
k8s.io/apimachinery v0.0.0
11-
k8s.io/apiserver v0.0.0
12-
k8s.io/client-go v0.0.0
13-
k8s.io/code-generator v0.0.0
14-
k8s.io/component-base v0.0.0
10+
k8s.io/apimachinery v0.0.0-20230210142156-eabbfd57b6c3
11+
k8s.io/apiserver v0.0.0-20230210165428-05e39c775240
12+
k8s.io/client-go v0.0.0-20230210153645-2e3434888bb3
13+
k8s.io/code-generator v0.0.0-20230210135354-73b9c40d1bb5
14+
k8s.io/component-base v0.0.0-20230210155927-2dcbf9413284
1515
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280
1616
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d
1717
)
@@ -94,23 +94,22 @@ require (
9494
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
9595
gopkg.in/yaml.v2 v2.4.0 // indirect
9696
gopkg.in/yaml.v3 v3.0.1 // indirect
97-
k8s.io/api v0.0.0 // indirect
97+
k8s.io/api v0.0.0-20230210143906-1c6bd7031bcf // indirect
9898
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
9999
k8s.io/klog/v2 v2.80.1 // indirect
100-
k8s.io/kms v0.0.0 // indirect
100+
k8s.io/kms v0.0.0-20230210162116-4dbde34ed1c6 // indirect
101101
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.35 // indirect
102102
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
103103
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
104104
sigs.k8s.io/yaml v1.3.0 // indirect
105105
)
106106

107107
replace (
108-
k8s.io/api => ../api
109-
k8s.io/apimachinery => ../apimachinery
110-
k8s.io/apiserver => ../apiserver
111-
k8s.io/client-go => ../client-go
112-
k8s.io/code-generator => ../code-generator
113-
k8s.io/component-base => ../component-base
114-
k8s.io/kms => ../kms
115-
k8s.io/sample-apiserver => ../sample-apiserver
108+
k8s.io/api => k8s.io/api v0.0.0-20230210143906-1c6bd7031bcf
109+
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230210142156-eabbfd57b6c3
110+
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20230210165428-05e39c775240
111+
k8s.io/client-go => k8s.io/client-go v0.0.0-20230210153645-2e3434888bb3
112+
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20230210135354-73b9c40d1bb5
113+
k8s.io/component-base => k8s.io/component-base v0.0.0-20230210155927-2dcbf9413284
114+
k8s.io/kms => k8s.io/kms v0.0.0-20230210162116-4dbde34ed1c6
116115
)

go.sum

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -717,11 +717,25 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
717717
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
718718
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
719719
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
720+
k8s.io/api v0.0.0-20230210143906-1c6bd7031bcf h1:9xPQVVAQ6dBWeQhmtmP4oNF0X7bC6ei5Ek7RrFzyBnQ=
721+
k8s.io/api v0.0.0-20230210143906-1c6bd7031bcf/go.mod h1:nbJ6QmNQBibrap0HTOvWFJKxGK/BrzYLsHxUzTeQVmk=
722+
k8s.io/apimachinery v0.0.0-20230210142156-eabbfd57b6c3 h1:RN3IQSPP01c+YjfkiCORSIyDxHiZ5MnjUJEczkgihis=
723+
k8s.io/apimachinery v0.0.0-20230210142156-eabbfd57b6c3/go.mod h1:HWHg+XOdXb6/tSnEPcCnHox2Q9pEHVBOoy/uDTqdD2U=
724+
k8s.io/apiserver v0.0.0-20230210165428-05e39c775240 h1:izz6B6dCUA/kgSF5F7+vbeYI/UazQeBiIYOZpgJkvjk=
725+
k8s.io/apiserver v0.0.0-20230210165428-05e39c775240/go.mod h1:4mR+h14ymvMXcfzzz65SktrBd8tFG2Ffmm4GCpUQbsw=
726+
k8s.io/client-go v0.0.0-20230210153645-2e3434888bb3 h1:ULD2jmZv0ad5l+sY40V19QSmSIJo8g/1vd8zz9yuX8c=
727+
k8s.io/client-go v0.0.0-20230210153645-2e3434888bb3/go.mod h1:F0c5iAdVOmjB4/PrZUBO53STxj5j3DE6g4xOn/o/WUY=
728+
k8s.io/code-generator v0.0.0-20230210135354-73b9c40d1bb5 h1:fvEVZy+FZh+Hhf3l5Smkx7VKneNeJG+57eeZ3K3AQLo=
729+
k8s.io/code-generator v0.0.0-20230210135354-73b9c40d1bb5/go.mod h1:3FVkQhSrz/EnijH2QGOWPfIbWCf5QyTZ3CAiTdt74jM=
730+
k8s.io/component-base v0.0.0-20230210155927-2dcbf9413284 h1:Wyx2zUTgx24uE38TvovTGFw+bGhQQXsOyIHeur5/pT8=
731+
k8s.io/component-base v0.0.0-20230210155927-2dcbf9413284/go.mod h1:3Vr9lpWind8jJlqQjSNyw43+mk5QmPcLmDFJnxtIvGc=
720732
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d h1:U9tB195lKdzwqicbJvyJeOXV7Klv+wNAWENRnXEGi08=
721733
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
722734
k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
723735
k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4=
724736
k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
737+
k8s.io/kms v0.0.0-20230210162116-4dbde34ed1c6 h1:9xslyqSMagcgKRC8qpDC0/chyq0jwYDC4FjDEdAHul8=
738+
k8s.io/kms v0.0.0-20230210162116-4dbde34ed1c6/go.mod h1:ts2SCIYR8JHLU6G4a/j6vkj99DTHGzJpOCJOZYydrpM=
725739
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+OGxg8HsuBr/5f6tVAjDu6E=
726740
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4=
727741
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d h1:0Smp/HP1OH4Rvhe+4B8nWGERtlqAGSftbSbbmm45oFs=

0 commit comments

Comments
 (0)