From fa3c65eff08bd367aaaba85bc1558bcda72c88e1 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Mon, 4 Sep 2023 01:01:49 -0700 Subject: [PATCH] Merge pull request #120360 from Jefftree/automated-cherry-pick-of-#119870-upstream-release-1.27 Automated cherry pick of #119870: Fallback to legacy discovery on a wider range of conditions Kubernetes-commit: cf67dd0379b6da0428530ab1c384ab71e335b5a2 --- go.mod | 4 ++-- go.sum | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 06bd6ae80a..bd8b7463f0 100644 --- a/go.mod +++ b/go.mod @@ -24,7 +24,7 @@ require ( golang.org/x/term v0.6.0 golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 google.golang.org/protobuf v1.28.1 - k8s.io/api v0.0.0-20230810162708-366ac8e0b0e7 + k8s.io/api v0.0.0-20230828183613-acad30015007 k8s.io/apimachinery v0.0.0-20230716201907-f46cb694b153 k8s.io/klog/v2 v2.90.1 k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f @@ -59,6 +59,6 @@ require ( ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20230810162708-366ac8e0b0e7 + k8s.io/api => k8s.io/api v0.0.0-20230828183613-acad30015007 k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230716201907-f46cb694b153 ) diff --git a/go.sum b/go.sum index a7a6cc8d0a..0a26222fbd 100644 --- a/go.sum +++ b/go.sum @@ -477,8 +477,8 @@ 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-20230810162708-366ac8e0b0e7 h1:QSCbO4nqtz+R8QJiF7euz3a1G8nI6aCFnefGxDiESI0= -k8s.io/api v0.0.0-20230810162708-366ac8e0b0e7/go.mod h1:BWkQci1GNcqqb+qGAExwyIXADZGrGeKn7HyT0uocwWM= +k8s.io/api v0.0.0-20230828183613-acad30015007 h1:ZlK0k2inBupPxnX2qFcK5qGNJSjtFyVY7rtM2Q3Kios= +k8s.io/api v0.0.0-20230828183613-acad30015007/go.mod h1:BWkQci1GNcqqb+qGAExwyIXADZGrGeKn7HyT0uocwWM= k8s.io/apimachinery v0.0.0-20230716201907-f46cb694b153 h1:x2PSNcoDv7r2/kHjMWs1jAWYQjINJElAVG7B0mEOF2E= k8s.io/apimachinery v0.0.0-20230716201907-f46cb694b153/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E= k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=