From 28eb995de7159e2f14bccea75fc5ed3b196b0af9 Mon Sep 17 00:00:00 2001 From: Nick Turner Date: Wed, 8 Feb 2023 18:06:10 -0800 Subject: [PATCH] Pin golang.org/x/net to v0.4.0 in 1.26 Kubernetes-commit: c5fe6226c4aee24c100cf35fdf105ad3abf82026 --- go.mod | 31 ++++++++++++++++--------------- go.sum | 18 ++---------------- 2 files changed, 18 insertions(+), 31 deletions(-) diff --git a/go.mod b/go.mod index e631b1fee..986cd7a14 100644 --- a/go.mod +++ b/go.mod @@ -23,12 +23,12 @@ require ( google.golang.org/grpc v1.49.0 google.golang.org/protobuf v1.28.1 gopkg.in/yaml.v2 v2.4.0 - k8s.io/api v0.0.0-20221227185931-07a9cbc7b3b1 - k8s.io/apimachinery v0.0.0-20230111232008-373a5f752d44 - k8s.io/apiserver v0.0.0-20230112074716-81b63bfb3256 - k8s.io/client-go v0.0.0-20221227214233-0c34939c9bcb - k8s.io/code-generator v0.0.0-20221208054844-6063700ba34d - k8s.io/component-base v0.0.0-20230110174730-0b623d3c56e9 + k8s.io/api v0.0.0 + k8s.io/apimachinery v0.0.0 + k8s.io/apiserver v0.0.0 + k8s.io/client-go v0.0.0 + k8s.io/code-generator v0.0.0 + k8s.io/component-base v0.0.0 k8s.io/klog/v2 v2.80.1 k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 k8s.io/utils v0.0.0-20221107191617-1a15be271d1d @@ -107,7 +107,7 @@ require ( go.uber.org/zap v1.19.0 // indirect golang.org/x/crypto v0.1.0 // indirect golang.org/x/mod v0.6.0 // indirect - golang.org/x/net v0.3.1-0.20221206200815-1e63c2f08a10 // indirect + golang.org/x/net v0.4.0 // indirect golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect golang.org/x/sys v0.3.0 // indirect @@ -120,16 +120,17 @@ require ( gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect - k8s.io/kms v0.0.0-20221208063806-3bf04e13ad9a // indirect + k8s.io/kms v0.0.0 // indirect sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.35 // indirect ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20221227185931-07a9cbc7b3b1 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230111232008-373a5f752d44 - k8s.io/apiserver => k8s.io/apiserver v0.0.0-20230112074716-81b63bfb3256 - k8s.io/client-go => k8s.io/client-go v0.0.0-20221227214233-0c34939c9bcb - k8s.io/code-generator => k8s.io/code-generator v0.0.0-20221208054844-6063700ba34d - k8s.io/component-base => k8s.io/component-base v0.0.0-20230110174730-0b623d3c56e9 - k8s.io/kms => k8s.io/kms v0.0.0-20221208063806-3bf04e13ad9a + k8s.io/api => ../api + k8s.io/apiextensions-apiserver => ../apiextensions-apiserver + k8s.io/apimachinery => ../apimachinery + k8s.io/apiserver => ../apiserver + k8s.io/client-go => ../client-go + k8s.io/code-generator => ../code-generator + k8s.io/component-base => ../component-base + k8s.io/kms => ../kms ) diff --git a/go.sum b/go.sum index 78fac4a5f..f381143b5 100644 --- a/go.sum +++ b/go.sum @@ -585,8 +585,8 @@ golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.3.1-0.20221206200815-1e63c2f08a10 h1:Frnccbp+ok2GkUS2tC84yAq/U9Vg+0sIO7aRL3T4Xnc= -golang.org/x/net v0.3.1-0.20221206200815-1e63c2f08a10/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= +golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU= +golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -869,25 +869,11 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.0.0-20221227185931-07a9cbc7b3b1 h1:YJxja/EAJoBLVlXPjUEyaO32DsjAcqjY7DEVfZtEq78= -k8s.io/api v0.0.0-20221227185931-07a9cbc7b3b1/go.mod h1:GetGjgKCUeHLs1GMrltnUDUYPvhhro0e4BozgWsM0Jk= -k8s.io/apimachinery v0.0.0-20230111232008-373a5f752d44 h1:w9HNLfeng207Q9+Nmw2iGWlp6vfNVc5E4sjfHRxV4sY= -k8s.io/apimachinery v0.0.0-20230111232008-373a5f752d44/go.mod h1:tnPmbONNJ7ByJNz9+n9kMjNP8ON+1qoAIIC70lztu74= -k8s.io/apiserver v0.0.0-20230112074716-81b63bfb3256 h1:AU6KsjyjdOpHigEa0/1nMi8hyHoscaP5THaH0pZ2Dmw= -k8s.io/apiserver v0.0.0-20230112074716-81b63bfb3256/go.mod h1:vYq1MZhcnRU5BZv7vSLnXvlWf+rZWYEBrgT+ujAM4g8= -k8s.io/client-go v0.0.0-20221227214233-0c34939c9bcb h1:4GM41f+eXZ0ccGX5wMjQ9WfPQzVvBUbJ4DZrkBWQXpg= -k8s.io/client-go v0.0.0-20221227214233-0c34939c9bcb/go.mod h1:vWaQHXAqLmjyGsp6Ltc1esfPRYDev/ZLPiGkqPFqWzs= -k8s.io/code-generator v0.0.0-20221208054844-6063700ba34d h1:N3ad8NSOang9kMhOCQxvoGqMPEoUP6QNJCYCfqBfHY8= -k8s.io/code-generator v0.0.0-20221208054844-6063700ba34d/go.mod h1:OMoJ5Dqx1wgaQzKgc+ZWaZPfGjdRq/Y3WubFrZmeI3I= -k8s.io/component-base v0.0.0-20230110174730-0b623d3c56e9 h1:u7WBaykxKJyiCci5iITB6fVIuT5azqn5B+Q+3blJLzU= -k8s.io/component-base v0.0.0-20230110174730-0b623d3c56e9/go.mod h1:jhlK1mHFbNnBgJb0MOpyr2wwwcZ6oP1gr8fiZXgTzDo= k8s.io/gengo v0.0.0-20220902162205-c0856e24416d h1:U9tB195lKdzwqicbJvyJeOXV7Klv+wNAWENRnXEGi08= k8s.io/gengo v0.0.0-20220902162205-c0856e24416d/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4= k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/kms v0.0.0-20221208063806-3bf04e13ad9a h1:41OBvSWw9lfYgFdEHWjEINfXFf8/vAVZER7ZFMhePwA= -k8s.io/kms v0.0.0-20221208063806-3bf04e13ad9a/go.mod h1:ReC1IEGuxgfN+PDCIpR6w8+XMmDE7uJhxcCwMZFdIYc= k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+OGxg8HsuBr/5f6tVAjDu6E= k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4= k8s.io/utils v0.0.0-20221107191617-1a15be271d1d h1:0Smp/HP1OH4Rvhe+4B8nWGERtlqAGSftbSbbmm45oFs=