From b63afdf260a7b65f0721f721a6c3f130ba2fa1f5 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Tue, 15 Nov 2022 17:08:47 -0800 Subject: [PATCH] Merge pull request #113425 from aimuz/automated-cherry-pick-of-#112693-upstream-release-1.25 Automated cherry pick of #112693: Fixed (CVE-2022-27664) Bump golang.org/x/net to Kubernetes-commit: c8d0fbe009b48f96e36bba9c36e20dba79bfdd05 --- go.mod | 9 ++++----- go.sum | 4 ++++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index dabc13939..81c707876 100644 --- a/go.mod +++ b/go.mod @@ -26,8 +26,8 @@ require ( golang.org/x/term v0.1.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-20221116015155-70abe330cadd + k8s.io/apimachinery v0.0.0-20221116014806-0cb034a48677 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-20221116015155-70abe330cadd + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20221116014806-0cb034a48677 ) diff --git a/go.sum b/go.sum index 1ed21d1c6..10b98b058 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-20221116015155-70abe330cadd h1:VNC35xzZgL+LDL6rwGs98gChgFhytVdj44QCPvo/dGw= +k8s.io/api v0.0.0-20221116015155-70abe330cadd/go.mod h1:EQTN4w+o3mKcHM+y9wpP+ZWPBqvOYF0UIp0JeSTZYN4= +k8s.io/apimachinery v0.0.0-20221116014806-0cb034a48677 h1:tvWPTjTVIWYcIq+qvIdKEi9h4N9kk/VbtfL6q4Vilfg= +k8s.io/apimachinery v0.0.0-20221116014806-0cb034a48677/go.mod h1:5lPbqMG43z11tv1mic52QrCRtTBVCMXP1o10nVUiomU= 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=