From e42bae1174faa418de3cae222a4053d2e5c42998 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Fri, 10 Feb 2023 01:05:42 -0800 Subject: [PATCH] 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 --- go.mod | 9 ++++----- go.sum | 4 ++++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 0d3732890..2785dd04e 100644 --- a/go.mod +++ b/go.mod @@ -26,8 +26,8 @@ require ( golang.org/x/term v0.3.0 golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 google.golang.org/protobuf v1.28.0 - k8s.io/api v0.0.0 - k8s.io/apimachinery v0.0.0 + k8s.io/api v0.0.0-20230210143720-61b78067ef2e + k8s.io/apimachinery v0.0.0-20230210141722-ae9c6dffbed8 k8s.io/klog/v2 v2.70.1 k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed @@ -70,7 +70,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-20230210143720-61b78067ef2e + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230210141722-ae9c6dffbed8 ) diff --git a/go.sum b/go.sum index 952d8e038..aa17d577c 100644 --- a/go.sum +++ b/go.sum @@ -667,6 +667,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-20230210143720-61b78067ef2e h1:lWyvynY+r1veWNNoaf7Pss4A0l7xq8A2WDQa2aq0/KU= +k8s.io/api v0.0.0-20230210143720-61b78067ef2e/go.mod h1:AKkBQr62BmtCtHKH9zmCdLjvZEIpGQDLgs9QqpZb/WM= +k8s.io/apimachinery v0.0.0-20230210141722-ae9c6dffbed8 h1:AL6FJNNR+xuwnV8QA3VTIYrJoJjQwAr9wUhoM7pm/qo= +k8s.io/apimachinery v0.0.0-20230210141722-ae9c6dffbed8/go.mod h1:7XUKBww8n9iYmxWjyQkuqNOBe46nRApEQxAsPFWAZ/E= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.70.1 h1:7aaoSdahviPmR+XkS7FyxlkkXs6tHISSG03RxleQAVQ= k8s.io/klog/v2 v2.70.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=