From 23d320a58340339eb949350e8413ec2133353c3e 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: 86904a7c580d369edc60c5807ef1377d1ff647d2 --- go.mod | 33 +++++++++++++++++---------------- go.sum | 18 ++---------------- 2 files changed, 19 insertions(+), 32 deletions(-) diff --git a/go.mod b/go.mod index ef3aa90b8..8d09cb60d 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-20230327181953-5b93db5944f3 - k8s.io/apimachinery v0.0.0-20230315054728-8d1258da8f38 - k8s.io/cli-runtime v0.0.0-20230327191336-374c47cbad88 - k8s.io/client-go v0.0.0-20230327183152-559da627e81e - k8s.io/component-base v0.0.0-20230327184055-11d07bf76eb4 - k8s.io/component-helpers v0.0.0-20230327184239-f6654932cffe + 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-20230327191135-c9e47f065d9b + 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-20230327181953-5b93db5944f3 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230315054728-8d1258da8f38 - k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20230327191336-374c47cbad88 - k8s.io/client-go => k8s.io/client-go v0.0.0-20230327183152-559da627e81e - k8s.io/code-generator => k8s.io/code-generator v0.0.0-20230327162619-6533006896fa - k8s.io/component-base => k8s.io/component-base v0.0.0-20230327184055-11d07bf76eb4 - k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20230327184239-f6654932cffe - k8s.io/metrics => k8s.io/metrics v0.0.0-20230327191135-c9e47f065d9b + 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 54fe73a7a..a645374fe 100644 --- a/go.sum +++ b/go.sum @@ -539,24 +539,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-20230327181953-5b93db5944f3 h1:XvTPeYtRRACrKZGRDkpHMRXq/xT9/cWZPv+Sx7t4HHU= -k8s.io/api v0.0.0-20230327181953-5b93db5944f3/go.mod h1:RAYThv5ELmDNk2Kt+PWiwWtAI1TZyap1JK1QStRzwyw= -k8s.io/apimachinery v0.0.0-20230315054728-8d1258da8f38 h1:n1qDRCTPAXwyXYg7eSpWDO9FdW79lwAQ9dAr1vETpn4= -k8s.io/apimachinery v0.0.0-20230315054728-8d1258da8f38/go.mod h1:5ikh59fK3AJ287GUvpUsryoMFtH9zj/ARfWCo3AyXTM= -k8s.io/cli-runtime v0.0.0-20230327191336-374c47cbad88 h1:OfEOT8wq8KNrrq1Ps8octpNDH/C9Ly/pmtl3V36cLrY= -k8s.io/cli-runtime v0.0.0-20230327191336-374c47cbad88/go.mod h1:fXFx83bME6MKF4HGngiptcLos2T07cUDtETL8YQcMDk= -k8s.io/client-go v0.0.0-20230327183152-559da627e81e h1:TlvjcU/+pjDx/uP3Dg06MaFcB3MhlBGi6ieut7uAt7E= -k8s.io/client-go v0.0.0-20230327183152-559da627e81e/go.mod h1:E+a5NHIY/xgy5Gv8qVtZIhbNtrYNmezoWCHejv0GBO4= -k8s.io/component-base v0.0.0-20230327184055-11d07bf76eb4 h1:DLLIQIjjTHk3GV7Rlu1PZBxCYb9uCe0yXHf9GdAqscI= -k8s.io/component-base v0.0.0-20230327184055-11d07bf76eb4/go.mod h1:sZCB0ROlbOCEFohUJIR27eMb7zq+eyPcNyRVB0rJcXI= -k8s.io/component-helpers v0.0.0-20230327184239-f6654932cffe h1:odq4pw1P3nPDeiCSFqC3hOjFwIwftHNzOZm13hWOCNs= -k8s.io/component-helpers v0.0.0-20230327184239-f6654932cffe/go.mod h1:lwSO71itiOLCA0V18H7TqYHq1UkzbLSSbDYQg98EHbI= 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-20230327191135-c9e47f065d9b h1:R/y1+mUCKz+Wtoog9wu2wPgPPicYto0R5E2gQLu7kxA= -k8s.io/metrics v0.0.0-20230327191135-c9e47f065d9b/go.mod h1:CX4izHMZh134ILayEN3Z1Cb7aeZScbfEriUPw1Iqkcw= +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=