From cf356053e43ca436c7849d2fd5c52b3eeb3c653a Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Mon, 1 May 2023 12:30:23 -0700 Subject: [PATCH] Merge pull request #117705 from Jefftree/update-openapi-fix-race Update kube-openapi to fix race Kubernetes-commit: 3f8c4794eadf8aadd8a5bcb0b875bf0af5c2020b --- go.mod | 31 +++++++++++++++---------------- go.sum | 14 ++++++++++++++ 2 files changed, 29 insertions(+), 16 deletions(-) diff --git a/go.mod b/go.mod index 524aa280..78d7ae9f 100644 --- a/go.mod +++ b/go.mod @@ -30,15 +30,15 @@ require ( github.com/stretchr/testify v1.8.2 golang.org/x/sys v0.7.0 gopkg.in/yaml.v2 v2.4.0 - k8s.io/api v0.0.0 - k8s.io/apimachinery v0.0.0 - k8s.io/cli-runtime v0.0.0 - k8s.io/client-go v0.0.0 - k8s.io/component-base v0.0.0 - k8s.io/component-helpers v0.0.0 + k8s.io/api v0.0.0-20230501174425-14796d1f9020 + k8s.io/apimachinery v0.0.0-20230501213034-4749b4e24f66 + k8s.io/cli-runtime v0.0.0-20230501230530-d44b4d77176d + k8s.io/client-go v0.0.0-20230501214135-10f4062eb6e8 + k8s.io/component-base v0.0.0-20230501221019-ba15531b8233 + k8s.io/component-helpers v0.0.0-20230501221513-9f84e26d89c3 k8s.io/klog/v2 v2.90.1 k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f - k8s.io/metrics v0.0.0 + k8s.io/metrics v0.0.0-20230501225918-3c50e9e53fa4 k8s.io/utils v0.0.0-20230209194617-a36077c30491 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd sigs.k8s.io/kustomize/kustomize/v5 v5.0.1 @@ -94,13 +94,12 @@ require ( ) replace ( - k8s.io/api => ../api - k8s.io/apimachinery => ../apimachinery - k8s.io/cli-runtime => ../cli-runtime - k8s.io/client-go => ../client-go - k8s.io/code-generator => ../code-generator - k8s.io/component-base => ../component-base - k8s.io/component-helpers => ../component-helpers - k8s.io/kubectl => ../kubectl - k8s.io/metrics => ../metrics + k8s.io/api => k8s.io/api v0.0.0-20230501174425-14796d1f9020 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230501213034-4749b4e24f66 + k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20230501230530-d44b4d77176d + k8s.io/client-go => k8s.io/client-go v0.0.0-20230501214135-10f4062eb6e8 + k8s.io/code-generator => k8s.io/code-generator v0.0.0-20230501212622-ce065752af56 + k8s.io/component-base => k8s.io/component-base v0.0.0-20230501221019-ba15531b8233 + k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20230501221513-9f84e26d89c3 + k8s.io/metrics => k8s.io/metrics v0.0.0-20230501225918-3c50e9e53fa4 ) diff --git a/go.sum b/go.sum index 06839b78..5bd0ffba 100644 --- a/go.sum +++ b/go.sum @@ -540,10 +540,24 @@ 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-20230501174425-14796d1f9020 h1:S9xIIE+YN8m+OzIH+081ybssE8ez+7WUqGhLXiJPJiY= +k8s.io/api v0.0.0-20230501174425-14796d1f9020/go.mod h1:Q3mFvxQWcKDcMww6VOwmdhvjHt4L2TegJLa6Q12hjGg= +k8s.io/apimachinery v0.0.0-20230501213034-4749b4e24f66 h1:5+1+biEctM8zPpQ0xzjsc3WK5Q0qcSfdnfl53nrEJHk= +k8s.io/apimachinery v0.0.0-20230501213034-4749b4e24f66/go.mod h1:D/d0HgOLmg6/40zRBT8Tzb0OSoysLc8CBtPty5QmjEM= +k8s.io/cli-runtime v0.0.0-20230501230530-d44b4d77176d h1:9vhlG82Aeifx+6a7YO2h/+gQVo85rs5yerJ+7reXGqc= +k8s.io/cli-runtime v0.0.0-20230501230530-d44b4d77176d/go.mod h1:uHl4W1oDbzdLx6fXJigQfIPSohmT7MQp0c81xP7eukQ= +k8s.io/client-go v0.0.0-20230501214135-10f4062eb6e8 h1:2rKlbILUO+3snuM9kNYIG9chih66YT74KvKO7SjMhx8= +k8s.io/client-go v0.0.0-20230501214135-10f4062eb6e8/go.mod h1:pjUllY1G+kLwpVTuoAchVkLA2fBz8UEoJ8jh0iEECPE= +k8s.io/component-base v0.0.0-20230501221019-ba15531b8233 h1:9hrVHZ7vsrJlVv3fp5p7nXg7J1e+Hq/EgFLrjM9odl0= +k8s.io/component-base v0.0.0-20230501221019-ba15531b8233/go.mod h1:NGCxB/ykdnVkrGmvZWQ5h4JMSIXyB3G3SzAbpuCbask= +k8s.io/component-helpers v0.0.0-20230501221513-9f84e26d89c3 h1:Wm412iO0IS93oX2w+63RnKE1CmhjE3cnymdI7BOfFUg= +k8s.io/component-helpers v0.0.0-20230501221513-9f84e26d89c3/go.mod h1:Y7UX5cqNrdb20nKAOujOnPdpIPKfwZqrwv/6vZeRfAQ= 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= k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f/go.mod h1:byini6yhqGC14c3ebc/QwanvYwhuMWF6yz2F8uwW8eg= +k8s.io/metrics v0.0.0-20230501225918-3c50e9e53fa4 h1:4Mfc9REvS73VqE1hgrJhmoeausP6h+eg+PFhzapYfO4= +k8s.io/metrics v0.0.0-20230501225918-3c50e9e53fa4/go.mod h1:9TfztuGnrRKNb2NZ5A9y1pYrWqKlFy7ZyjzcfhL1U7w= k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY= k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=