From f72cc5c33ce28152ca4e1b7079a2756b983afbb5 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Fri, 10 Feb 2023 00:05:38 -0800 Subject: [PATCH] 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 --- go.mod | 29 ++++++++++++++--------------- go.sum | 14 ++++++++++++++ 2 files changed, 28 insertions(+), 15 deletions(-) diff --git a/go.mod b/go.mod index 986cd7a14..b8154480e 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 - 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/api v0.0.0-20230210143906-1c6bd7031bcf + k8s.io/apimachinery v0.0.0-20230210142156-eabbfd57b6c3 + k8s.io/apiserver v0.0.0-20230210165428-05e39c775240 + k8s.io/client-go v0.0.0-20230210153645-2e3434888bb3 + k8s.io/code-generator v0.0.0-20230210135354-73b9c40d1bb5 + k8s.io/component-base v0.0.0-20230210155927-2dcbf9413284 k8s.io/klog/v2 v2.80.1 k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 k8s.io/utils v0.0.0-20221107191617-1a15be271d1d @@ -120,17 +120,16 @@ 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 // indirect + k8s.io/kms v0.0.0-20230210162116-4dbde34ed1c6 // indirect sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.35 // indirect ) replace ( - 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 + k8s.io/api => k8s.io/api v0.0.0-20230210143906-1c6bd7031bcf + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230210142156-eabbfd57b6c3 + k8s.io/apiserver => k8s.io/apiserver v0.0.0-20230210165428-05e39c775240 + k8s.io/client-go => k8s.io/client-go v0.0.0-20230210153645-2e3434888bb3 + k8s.io/code-generator => k8s.io/code-generator v0.0.0-20230210135354-73b9c40d1bb5 + k8s.io/component-base => k8s.io/component-base v0.0.0-20230210155927-2dcbf9413284 + k8s.io/kms => k8s.io/kms v0.0.0-20230210162116-4dbde34ed1c6 ) diff --git a/go.sum b/go.sum index f381143b5..8e466d497 100644 --- a/go.sum +++ b/go.sum @@ -869,11 +869,25 @@ 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-20230210143906-1c6bd7031bcf h1:9xPQVVAQ6dBWeQhmtmP4oNF0X7bC6ei5Ek7RrFzyBnQ= +k8s.io/api v0.0.0-20230210143906-1c6bd7031bcf/go.mod h1:nbJ6QmNQBibrap0HTOvWFJKxGK/BrzYLsHxUzTeQVmk= +k8s.io/apimachinery v0.0.0-20230210142156-eabbfd57b6c3 h1:RN3IQSPP01c+YjfkiCORSIyDxHiZ5MnjUJEczkgihis= +k8s.io/apimachinery v0.0.0-20230210142156-eabbfd57b6c3/go.mod h1:HWHg+XOdXb6/tSnEPcCnHox2Q9pEHVBOoy/uDTqdD2U= +k8s.io/apiserver v0.0.0-20230210165428-05e39c775240 h1:izz6B6dCUA/kgSF5F7+vbeYI/UazQeBiIYOZpgJkvjk= +k8s.io/apiserver v0.0.0-20230210165428-05e39c775240/go.mod h1:4mR+h14ymvMXcfzzz65SktrBd8tFG2Ffmm4GCpUQbsw= +k8s.io/client-go v0.0.0-20230210153645-2e3434888bb3 h1:ULD2jmZv0ad5l+sY40V19QSmSIJo8g/1vd8zz9yuX8c= +k8s.io/client-go v0.0.0-20230210153645-2e3434888bb3/go.mod h1:F0c5iAdVOmjB4/PrZUBO53STxj5j3DE6g4xOn/o/WUY= +k8s.io/code-generator v0.0.0-20230210135354-73b9c40d1bb5 h1:fvEVZy+FZh+Hhf3l5Smkx7VKneNeJG+57eeZ3K3AQLo= +k8s.io/code-generator v0.0.0-20230210135354-73b9c40d1bb5/go.mod h1:3FVkQhSrz/EnijH2QGOWPfIbWCf5QyTZ3CAiTdt74jM= +k8s.io/component-base v0.0.0-20230210155927-2dcbf9413284 h1:Wyx2zUTgx24uE38TvovTGFw+bGhQQXsOyIHeur5/pT8= +k8s.io/component-base v0.0.0-20230210155927-2dcbf9413284/go.mod h1:3Vr9lpWind8jJlqQjSNyw43+mk5QmPcLmDFJnxtIvGc= 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-20230210162116-4dbde34ed1c6 h1:9xslyqSMagcgKRC8qpDC0/chyq0jwYDC4FjDEdAHul8= +k8s.io/kms v0.0.0-20230210162116-4dbde34ed1c6/go.mod h1:ts2SCIYR8JHLU6G4a/j6vkj99DTHGzJpOCJOZYydrpM= 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=