Skip to content

Commit 05e39c7

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
2 parents bb42906 + b5756e5 commit 05e39c7

File tree

2 files changed

+23
-23
lines changed

2 files changed

+23
-23
lines changed

go.mod

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ require (
3333
go.opentelemetry.io/otel/trace v1.10.0
3434
go.uber.org/zap v1.19.0
3535
golang.org/x/crypto v0.1.0
36-
golang.org/x/net v0.3.1-0.20221206200815-1e63c2f08a10
36+
golang.org/x/net v0.4.0
3737
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4
3838
golang.org/x/sys v0.3.0
3939
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8
@@ -42,12 +42,12 @@ require (
4242
google.golang.org/protobuf v1.28.1
4343
gopkg.in/natefinch/lumberjack.v2 v2.0.0
4444
gopkg.in/square/go-jose.v2 v2.2.2
45-
k8s.io/api v0.0.0-20221227185931-07a9cbc7b3b1
46-
k8s.io/apimachinery v0.0.0-20230111232008-373a5f752d44
47-
k8s.io/client-go v0.0.0-20221227214233-0c34939c9bcb
48-
k8s.io/component-base v0.0.0-20230110174730-0b623d3c56e9
45+
k8s.io/api v0.0.0-20230210143906-1c6bd7031bcf
46+
k8s.io/apimachinery v0.0.0-20230210142156-eabbfd57b6c3
47+
k8s.io/client-go v0.0.0-20230210153645-2e3434888bb3
48+
k8s.io/component-base v0.0.0-20230210155927-2dcbf9413284
4949
k8s.io/klog/v2 v2.80.1
50-
k8s.io/kms v0.0.0-20221208063806-3bf04e13ad9a
50+
k8s.io/kms v0.0.0-20230210162116-4dbde34ed1c6
5151
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280
5252
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d
5353
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.35
@@ -122,9 +122,9 @@ require (
122122
)
123123

124124
replace (
125-
k8s.io/api => k8s.io/api v0.0.0-20221227185931-07a9cbc7b3b1
126-
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230111232008-373a5f752d44
127-
k8s.io/client-go => k8s.io/client-go v0.0.0-20221227214233-0c34939c9bcb
128-
k8s.io/component-base => k8s.io/component-base v0.0.0-20230110174730-0b623d3c56e9
129-
k8s.io/kms => k8s.io/kms v0.0.0-20221208063806-3bf04e13ad9a
125+
k8s.io/api => k8s.io/api v0.0.0-20230210143906-1c6bd7031bcf
126+
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230210142156-eabbfd57b6c3
127+
k8s.io/client-go => k8s.io/client-go v0.0.0-20230210153645-2e3434888bb3
128+
k8s.io/component-base => k8s.io/component-base v0.0.0-20230210155927-2dcbf9413284
129+
k8s.io/kms => k8s.io/kms v0.0.0-20230210162116-4dbde34ed1c6
130130
)

go.sum

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -624,8 +624,8 @@ golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qx
624624
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
625625
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
626626
golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
627-
golang.org/x/net v0.3.1-0.20221206200815-1e63c2f08a10 h1:Frnccbp+ok2GkUS2tC84yAq/U9Vg+0sIO7aRL3T4Xnc=
628-
golang.org/x/net v0.3.1-0.20221206200815-1e63c2f08a10/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
627+
golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU=
628+
golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
629629
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
630630
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
631631
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -986,18 +986,18 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
986986
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
987987
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
988988
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
989-
k8s.io/api v0.0.0-20221227185931-07a9cbc7b3b1 h1:YJxja/EAJoBLVlXPjUEyaO32DsjAcqjY7DEVfZtEq78=
990-
k8s.io/api v0.0.0-20221227185931-07a9cbc7b3b1/go.mod h1:GetGjgKCUeHLs1GMrltnUDUYPvhhro0e4BozgWsM0Jk=
991-
k8s.io/apimachinery v0.0.0-20230111232008-373a5f752d44 h1:w9HNLfeng207Q9+Nmw2iGWlp6vfNVc5E4sjfHRxV4sY=
992-
k8s.io/apimachinery v0.0.0-20230111232008-373a5f752d44/go.mod h1:tnPmbONNJ7ByJNz9+n9kMjNP8ON+1qoAIIC70lztu74=
993-
k8s.io/client-go v0.0.0-20221227214233-0c34939c9bcb h1:4GM41f+eXZ0ccGX5wMjQ9WfPQzVvBUbJ4DZrkBWQXpg=
994-
k8s.io/client-go v0.0.0-20221227214233-0c34939c9bcb/go.mod h1:vWaQHXAqLmjyGsp6Ltc1esfPRYDev/ZLPiGkqPFqWzs=
995-
k8s.io/component-base v0.0.0-20230110174730-0b623d3c56e9 h1:u7WBaykxKJyiCci5iITB6fVIuT5azqn5B+Q+3blJLzU=
996-
k8s.io/component-base v0.0.0-20230110174730-0b623d3c56e9/go.mod h1:jhlK1mHFbNnBgJb0MOpyr2wwwcZ6oP1gr8fiZXgTzDo=
989+
k8s.io/api v0.0.0-20230210143906-1c6bd7031bcf h1:9xPQVVAQ6dBWeQhmtmP4oNF0X7bC6ei5Ek7RrFzyBnQ=
990+
k8s.io/api v0.0.0-20230210143906-1c6bd7031bcf/go.mod h1:nbJ6QmNQBibrap0HTOvWFJKxGK/BrzYLsHxUzTeQVmk=
991+
k8s.io/apimachinery v0.0.0-20230210142156-eabbfd57b6c3 h1:RN3IQSPP01c+YjfkiCORSIyDxHiZ5MnjUJEczkgihis=
992+
k8s.io/apimachinery v0.0.0-20230210142156-eabbfd57b6c3/go.mod h1:HWHg+XOdXb6/tSnEPcCnHox2Q9pEHVBOoy/uDTqdD2U=
993+
k8s.io/client-go v0.0.0-20230210153645-2e3434888bb3 h1:ULD2jmZv0ad5l+sY40V19QSmSIJo8g/1vd8zz9yuX8c=
994+
k8s.io/client-go v0.0.0-20230210153645-2e3434888bb3/go.mod h1:F0c5iAdVOmjB4/PrZUBO53STxj5j3DE6g4xOn/o/WUY=
995+
k8s.io/component-base v0.0.0-20230210155927-2dcbf9413284 h1:Wyx2zUTgx24uE38TvovTGFw+bGhQQXsOyIHeur5/pT8=
996+
k8s.io/component-base v0.0.0-20230210155927-2dcbf9413284/go.mod h1:3Vr9lpWind8jJlqQjSNyw43+mk5QmPcLmDFJnxtIvGc=
997997
k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4=
998998
k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
999-
k8s.io/kms v0.0.0-20221208063806-3bf04e13ad9a h1:41OBvSWw9lfYgFdEHWjEINfXFf8/vAVZER7ZFMhePwA=
1000-
k8s.io/kms v0.0.0-20221208063806-3bf04e13ad9a/go.mod h1:ReC1IEGuxgfN+PDCIpR6w8+XMmDE7uJhxcCwMZFdIYc=
999+
k8s.io/kms v0.0.0-20230210162116-4dbde34ed1c6 h1:9xslyqSMagcgKRC8qpDC0/chyq0jwYDC4FjDEdAHul8=
1000+
k8s.io/kms v0.0.0-20230210162116-4dbde34ed1c6/go.mod h1:ts2SCIYR8JHLU6G4a/j6vkj99DTHGzJpOCJOZYydrpM=
10011001
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+OGxg8HsuBr/5f6tVAjDu6E=
10021002
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4=
10031003
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d h1:0Smp/HP1OH4Rvhe+4B8nWGERtlqAGSftbSbbmm45oFs=

0 commit comments

Comments
 (0)