Skip to content

Commit 035c1be

Browse files
Merge pull request #115641 from nckturner/pin-golang.org/x/net-to-v0.4.0-in-1.25
Pin golang.org/x/net to v0.4.0 in 1.25 Kubernetes-commit: 641272fbcf7a75a06fb55909b5514523271737ef
2 parents ccedb9a + 6daa707 commit 035c1be

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

go.mod

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ require (
2424
go.opentelemetry.io/otel/trace v0.20.0
2525
go.uber.org/zap v1.19.0
2626
golang.org/x/sys v0.3.0
27-
k8s.io/apimachinery v0.0.0-20230112020654-11eb99b88eea
28-
k8s.io/client-go v0.0.0-20221213000309-ab9a2e819915
27+
k8s.io/apimachinery v0.0.0-20230210141722-ae9c6dffbed8
28+
k8s.io/client-go v0.0.0-20230210152741-e42bae1174fa
2929
k8s.io/klog/v2 v2.70.1
3030
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed
3131
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2
@@ -65,7 +65,7 @@ require (
6565
go.uber.org/atomic v1.7.0 // indirect
6666
go.uber.org/goleak v1.2.0 // indirect
6767
go.uber.org/multierr v1.6.0 // indirect
68-
golang.org/x/net v0.3.1-0.20221206200815-1e63c2f08a10 // indirect
68+
golang.org/x/net v0.4.0 // indirect
6969
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
7070
golang.org/x/term v0.3.0 // indirect
7171
golang.org/x/text v0.5.0 // indirect
@@ -78,14 +78,14 @@ require (
7878
gopkg.in/yaml.v2 v2.4.0 // indirect
7979
gopkg.in/yaml.v3 v3.0.1 // indirect
8080
gotest.tools/v3 v3.0.3 // indirect
81-
k8s.io/api v0.0.0-20221207015936-be0bf1dc3a1b // indirect
81+
k8s.io/api v0.0.0-20230210143720-61b78067ef2e // indirect
8282
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
8383
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
8484
sigs.k8s.io/yaml v1.2.0 // indirect
8585
)
8686

8787
replace (
88-
k8s.io/api => k8s.io/api v0.0.0-20221207015936-be0bf1dc3a1b
89-
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230112020654-11eb99b88eea
90-
k8s.io/client-go => k8s.io/client-go v0.0.0-20221213000309-ab9a2e819915
88+
k8s.io/api => k8s.io/api v0.0.0-20230210143720-61b78067ef2e
89+
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230210141722-ae9c6dffbed8
90+
k8s.io/client-go => k8s.io/client-go v0.0.0-20230210152741-e42bae1174fa
9191
)

go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -392,8 +392,8 @@ golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81R
392392
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
393393
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
394394
golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
395-
golang.org/x/net v0.3.1-0.20221206200815-1e63c2f08a10 h1:Frnccbp+ok2GkUS2tC84yAq/U9Vg+0sIO7aRL3T4Xnc=
396-
golang.org/x/net v0.3.1-0.20221206200815-1e63c2f08a10/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
395+
golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU=
396+
golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
397397
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
398398
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
399399
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -643,12 +643,12 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
643643
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
644644
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
645645
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
646-
k8s.io/api v0.0.0-20221207015936-be0bf1dc3a1b h1:SBgSsDsdFZbBSt+TMVAgk8OUkvV6f5cGUruytlHLCFo=
647-
k8s.io/api v0.0.0-20221207015936-be0bf1dc3a1b/go.mod h1:YvZpuHvl+0aLny0+c5KuNrTfHfg3tZD+HDjQTLGxv3E=
648-
k8s.io/apimachinery v0.0.0-20230112020654-11eb99b88eea h1:l4D2Cuj3HLvu4mU6lfXcVFTITRLJGGQvGtbDTLFk9GI=
649-
k8s.io/apimachinery v0.0.0-20230112020654-11eb99b88eea/go.mod h1:1S2i1QHkmxc8+EZCIxe/fX5hpldVXk4gvnJInMEb8D4=
650-
k8s.io/client-go v0.0.0-20221213000309-ab9a2e819915 h1:loOzsCobgeqqopPCc4kaO82TLsh2YQhBS3LqIcDqDqc=
651-
k8s.io/client-go v0.0.0-20221213000309-ab9a2e819915/go.mod h1:0w1GFTVywsqLqr0oSdRPuws3XkkCkIXUpZZpf7Fc4yI=
646+
k8s.io/api v0.0.0-20230210143720-61b78067ef2e h1:lWyvynY+r1veWNNoaf7Pss4A0l7xq8A2WDQa2aq0/KU=
647+
k8s.io/api v0.0.0-20230210143720-61b78067ef2e/go.mod h1:AKkBQr62BmtCtHKH9zmCdLjvZEIpGQDLgs9QqpZb/WM=
648+
k8s.io/apimachinery v0.0.0-20230210141722-ae9c6dffbed8 h1:AL6FJNNR+xuwnV8QA3VTIYrJoJjQwAr9wUhoM7pm/qo=
649+
k8s.io/apimachinery v0.0.0-20230210141722-ae9c6dffbed8/go.mod h1:7XUKBww8n9iYmxWjyQkuqNOBe46nRApEQxAsPFWAZ/E=
650+
k8s.io/client-go v0.0.0-20230210152741-e42bae1174fa h1:iPEB00zopS8vY+qattG0/BhTsl3SiguW9FAMm+aXpvU=
651+
k8s.io/client-go v0.0.0-20230210152741-e42bae1174fa/go.mod h1:VZ0HfotlpyY/d95uMVe7Po2q4h6Q9ztdMS2Otgbyb2M=
652652
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
653653
k8s.io/klog/v2 v2.70.1 h1:7aaoSdahviPmR+XkS7FyxlkkXs6tHISSG03RxleQAVQ=
654654
k8s.io/klog/v2 v2.70.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=

0 commit comments

Comments
 (0)