From 7e4462aced1ff45903d2b0cf1ff8b68f056f4257 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Wed, 10 Nov 2021 14:46:36 -0800 Subject: [PATCH] Merge pull request #106257 from ulucinar/bump-k-openapi-1.20 Manual cherry pick of kube-openapi changes for release-1.20 Kubernetes-commit: 712d74c900f4eeae81ead1a7207f21efc2cd6a1b --- go.mod | 9 ++++----- go.sum | 4 ++++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 77746f914..ba2bf8e3e 100644 --- a/go.mod +++ b/go.mod @@ -26,15 +26,14 @@ require ( golang.org/x/net v0.0.0-20201110031124-69a78807bb2b golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e - k8s.io/api v0.0.0 - k8s.io/apimachinery v0.0.0 + k8s.io/api v0.0.0-20211111072721-19b6426640e4 + k8s.io/apimachinery v0.0.0-20211111072158-2e90a7f8ecac k8s.io/klog/v2 v2.4.0 k8s.io/utils v0.0.0-20201110183641-67b214c5f920 sigs.k8s.io/yaml v1.2.0 ) replace ( - k8s.io/api => ../api - k8s.io/apimachinery => ../apimachinery - k8s.io/client-go => ../client-go + k8s.io/api => k8s.io/api v0.0.0-20211111072721-19b6426640e4 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211111072158-2e90a7f8ecac ) diff --git a/go.sum b/go.sum index 39485407c..f453c790a 100644 --- a/go.sum +++ b/go.sum @@ -425,6 +425,10 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= 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= +k8s.io/api v0.0.0-20211111072721-19b6426640e4 h1:D9Z/HG2NIPFpYv9zp641OS8DgY5Q2wIWonrahse5j2o= +k8s.io/api v0.0.0-20211111072721-19b6426640e4/go.mod h1:lRybyiA880LjD6Su1v2QxF/ca5IB6jdxV1AER2UUkVs= +k8s.io/apimachinery v0.0.0-20211111072158-2e90a7f8ecac h1:6dWXjsoOB+DTM+s5iSXGZfxHzUq0TnDRss77HSKwjbc= +k8s.io/apimachinery v0.0.0-20211111072158-2e90a7f8ecac/go.mod h1:4KFiDSxCoGviCiRk9kTXIROsIf4VSGkVYjVJjJln3pg= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ=