From b105b5033102f03e4400d12a7ccf9fccb46c5dd1 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 | 31 +++++++++++++++---------------- go.sum | 14 ++++++++++++++ 2 files changed, 29 insertions(+), 16 deletions(-) diff --git a/go.mod b/go.mod index 8d09cb60d..23dfd7204 100644 --- a/go.mod +++ b/go.mod @@ -30,15 +30,15 @@ require ( github.com/stretchr/testify v1.8.1 golang.org/x/sys v0.6.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-20230424183503-a94d26e5d6b7 + k8s.io/apimachinery v0.0.0-20230502173644-b1123d27117a + k8s.io/cli-runtime v0.0.0-20230502191106-f3d32fda8a93 + k8s.io/client-go v0.0.0-20230502175410-015caa2eed83 + k8s.io/component-base v0.0.0-20230502181637-54279fc3898f + k8s.io/component-helpers v0.0.0-20230502182114-49b0134f8e09 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-20230502190449-eb196d5f7488 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-20230424183503-a94d26e5d6b7 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230502173644-b1123d27117a + k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20230502191106-f3d32fda8a93 + k8s.io/client-go => k8s.io/client-go v0.0.0-20230502175410-015caa2eed83 + k8s.io/code-generator => k8s.io/code-generator v0.0.0-20230502173038-1649c2d8b44c + k8s.io/component-base => k8s.io/component-base v0.0.0-20230502181637-54279fc3898f + k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20230502182114-49b0134f8e09 + k8s.io/metrics => k8s.io/metrics v0.0.0-20230502190449-eb196d5f7488 ) diff --git a/go.sum b/go.sum index a645374fe..e82c90f60 100644 --- a/go.sum +++ b/go.sum @@ -539,10 +539,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-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/cli-runtime v0.0.0-20230502191106-f3d32fda8a93 h1:bA+H+8GS5VzIpTDTWH2Sl1l9ghiBjU0nGDfwKBLIPRg= +k8s.io/cli-runtime v0.0.0-20230502191106-f3d32fda8a93/go.mod h1:hVqcVrQ5CIDtkTAHCE1fvsIyXEnBYn9tNafJkEI2SxQ= +k8s.io/client-go v0.0.0-20230502175410-015caa2eed83 h1:Y+W7N9YdXoKgzczTPQap9z6ha7257t/tnXFHYgKDzEM= +k8s.io/client-go v0.0.0-20230502175410-015caa2eed83/go.mod h1:c5U8Am3vnVxXbWLPrdZf47GVO5Pli26D0XTiRdht1rA= +k8s.io/component-base v0.0.0-20230502181637-54279fc3898f h1:UWQK+dUu4rd9VzjfwQhn4eP5YFqxKVoFHSSmrIXg3hI= +k8s.io/component-base v0.0.0-20230502181637-54279fc3898f/go.mod h1:q1A7LzmGZZvn6c5hRvuQ1h8peLmhvnZJQ9lxIdTrLUE= +k8s.io/component-helpers v0.0.0-20230502182114-49b0134f8e09 h1:pp755D6CWojSOB8Sdhq64T1NpXVnD/2O2eYyOI+T4tM= +k8s.io/component-helpers v0.0.0-20230502182114-49b0134f8e09/go.mod h1:EkG0efg7GyIH7ZVlsr8aR+Mc6qDprPtXeju5XdAsw4w= 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-20230502190449-eb196d5f7488 h1:epA6wPTGDlOVEsl5/YOCills3P6djnidw+vx+XM4OPc= +k8s.io/metrics v0.0.0-20230502190449-eb196d5f7488/go.mod h1:fd0YJVa7dRFd2BW5q1bIh7B/zPFUTyISGaOpRvPNbD0= 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=