From 015caa2eed8301978570a445b495883cf13c7b85 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Tue, 2 May 2023 07:16:15 -0700 Subject: [PATCH] Merge pull request #117708 from Jefftree/automated-cherry-pick-of-#117705-upstream-release-1.27 Automated cherry pick of #117705: Update kube-openapi to fix race Kubernetes-commit: 7d93cc600f4c6dbd5c0b9e37ae7f351cfc59fde7 --- go.mod | 9 ++++----- go.sum | 4 ++++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index c58daa0a56..b59b9c160d 100644 --- a/go.mod +++ b/go.mod @@ -24,8 +24,8 @@ 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 - k8s.io/apimachinery v0.0.0 + k8s.io/api v0.0.0-20230424183503-a94d26e5d6b7 + k8s.io/apimachinery v0.0.0-20230502173644-b1123d27117a k8s.io/klog/v2 v2.90.1 k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f k8s.io/utils v0.0.0-20230209194617-a36077c30491 @@ -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-20230424183503-a94d26e5d6b7 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230502173644-b1123d27117a ) diff --git a/go.sum b/go.sum index bbed333808..11d6ab3d5a 100644 --- a/go.sum +++ b/go.sum @@ -477,6 +477,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-20230424183503-a94d26e5d6b7 h1:QrPMgZCXYbzEq6h5azDuaqNoWs7rI3pKvW8pX/CBPqo= +k8s.io/api v0.0.0-20230424183503-a94d26e5d6b7/go.mod h1:RAYThv5ELmDNk2Kt+PWiwWtAI1TZyap1JK1QStRzwyw= +k8s.io/apimachinery v0.0.0-20230502173644-b1123d27117a h1:FId7MLgk0l0XnnlbixZAzcmQiWYsHGkIrxLlazD7RZA= +k8s.io/apimachinery v0.0.0-20230502173644-b1123d27117a/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E= k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw= k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f h1:2kWPakN3i/k81b0gvD5C5FJ2kxm1WrQFanWchyKuqGg=