From 2e3434888bb3190ff3e9a995565eb4c348f452c4 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 | 9 ++++----- go.sum | 4 ++++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index d8a5a916ea..94c8dd9a98 100644 --- a/go.mod +++ b/go.mod @@ -24,8 +24,8 @@ require ( golang.org/x/term v0.3.0 golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 google.golang.org/protobuf v1.28.1 - k8s.io/api v0.0.0 - k8s.io/apimachinery v0.0.0 + k8s.io/api v0.0.0-20230210143906-1c6bd7031bcf + k8s.io/apimachinery v0.0.0-20230210142156-eabbfd57b6c3 k8s.io/klog/v2 v2.80.1 k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 k8s.io/utils v0.0.0-20221107191617-1a15be271d1d @@ -59,7 +59,6 @@ require ( ) replace ( - k8s.io/api => ../api - k8s.io/apimachinery => ../apimachinery - k8s.io/client-go => ../client-go + k8s.io/api => k8s.io/api v0.0.0-20230210143906-1c6bd7031bcf + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230210142156-eabbfd57b6c3 ) diff --git a/go.sum b/go.sum index 6fcbd000e1..bb4f24959b 100644 --- a/go.sum +++ b/go.sum @@ -476,6 +476,10 @@ 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/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4= k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+OGxg8HsuBr/5f6tVAjDu6E=