From fde8c2eb63d84d732219b2e2ab3ac07e814c1fea Mon Sep 17 00:00:00 2001 From: Jefftree Date: Mon, 1 May 2023 17:19:03 +0000 Subject: [PATCH] Update kube-openapi to fix race Kubernetes-commit: de34540248a6cd4335a6aedd3f1d24c608d59c86 --- go.mod | 33 +++++++++++++++++---------------- go.sum | 18 ++---------------- 2 files changed, 19 insertions(+), 32 deletions(-) diff --git a/go.mod b/go.mod index 24a436ed3..524aa2808 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-20230501174425-14796d1f9020 - k8s.io/apimachinery v0.0.0-20230501093353-d563c9729062 - k8s.io/cli-runtime v0.0.0-20230501185706-ccd3d5591e77 - k8s.io/client-go v0.0.0-20230501175051-741627a2eb97 - k8s.io/component-base v0.0.0-20230501180126-f6a4fd2ef059 - k8s.io/component-helpers v0.0.0-20230501180348-458099d9b088 + 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/klog/v2 v2.90.1 - k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a - k8s.io/metrics v0.0.0-20230501185445-92822fb5d214 + k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f + k8s.io/metrics v0.0.0 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,12 +94,13 @@ require ( ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20230501174425-14796d1f9020 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230501093353-d563c9729062 - k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20230501185706-ccd3d5591e77 - k8s.io/client-go => k8s.io/client-go v0.0.0-20230501175051-741627a2eb97 - k8s.io/code-generator => k8s.io/code-generator v0.0.0-20230501155018-9b6e38cd137b - k8s.io/component-base => k8s.io/component-base v0.0.0-20230501180126-f6a4fd2ef059 - k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20230501180348-458099d9b088 - k8s.io/metrics => k8s.io/metrics v0.0.0-20230501185445-92822fb5d214 + 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 ) diff --git a/go.sum b/go.sum index b08d6df78..06839b784 100644 --- a/go.sum +++ b/go.sum @@ -540,24 +540,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-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-20230501093353-d563c9729062 h1:YRVK1TsKqSFL/SP2un7buT9skEyoFpQwrtzkdnOv1io= -k8s.io/apimachinery v0.0.0-20230501093353-d563c9729062/go.mod h1:8pvYyRbWovK8tOF+ubfyUBX6aGREZx9m61vDDA9aDTU= -k8s.io/cli-runtime v0.0.0-20230501185706-ccd3d5591e77 h1:fmpsK2fxfvJZ+VOogDIEs+u7fV8auvpEKeKLyi4mp1Y= -k8s.io/cli-runtime v0.0.0-20230501185706-ccd3d5591e77/go.mod h1:AKCc6mKQKi+Yf1nP2a7q0pajuIYLECupAC72eATltx0= -k8s.io/client-go v0.0.0-20230501175051-741627a2eb97 h1:o2MXEP6kktgZw6kd7HE57bUvN1ogj9Hrh4Y+MAWBnfw= -k8s.io/client-go v0.0.0-20230501175051-741627a2eb97/go.mod h1:xRN3LOJ9qzghYDdmYUANZcyn5AtgC5iFwEn/CGIKiTk= -k8s.io/component-base v0.0.0-20230501180126-f6a4fd2ef059 h1:bfx0pd/KveIVnCJ2am0WyRX7zg1GExO8D6SOPrIzFng= -k8s.io/component-base v0.0.0-20230501180126-f6a4fd2ef059/go.mod h1:gvrfbARZnC4fi4Z2qeJ/JpwN78gHUUnlLagLv95QDyY= -k8s.io/component-helpers v0.0.0-20230501180348-458099d9b088 h1:ON2u73s/BwthAiezb4HD5ArW+/IqeILWH8HllmtRv7M= -k8s.io/component-helpers v0.0.0-20230501180348-458099d9b088/go.mod h1:LVlHJuTbfaHqRY+R0RQP+H517RmxS5wYyxqK2x9KSRA= 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-20230308215209-15aac26d736a h1:gmovKNur38vgoWfGtP5QOGNOA7ki4n6qNYoFAgMlNvg= -k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a/go.mod h1:y5VtZWM9sHHc2ZodIH/6SHzXj+TPU5USoA8lcIeKEKY= -k8s.io/metrics v0.0.0-20230501185445-92822fb5d214 h1:U0mxus0mMpdhcC+mpmuwQUUsurD72XK67CaAapHH+/M= -k8s.io/metrics v0.0.0-20230501185445-92822fb5d214/go.mod h1:zlf+70qs5PnAIt0VeDT6iobaxna6c6GvFc2rL/pbjQc= +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/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=