From 73b9afbef63273658dbea037ebbc91e3c37368fc 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 | 31 ++++++++++++++++--------------- go.sum | 18 ++---------------- 2 files changed, 18 insertions(+), 31 deletions(-) diff --git a/go.mod b/go.mod index 9b5ed4cb0..4e69ebdbf 100644 --- a/go.mod +++ b/go.mod @@ -23,14 +23,14 @@ require ( google.golang.org/grpc v1.51.0 google.golang.org/protobuf v1.28.1 gopkg.in/yaml.v2 v2.4.0 - k8s.io/api v0.0.0-20230424183503-a94d26e5d6b7 - k8s.io/apimachinery v0.0.0-20230315054728-8d1258da8f38 - k8s.io/apiserver v0.0.0-20230427022934-df642d0ea44e - k8s.io/client-go v0.0.0-20230327183152-559da627e81e - k8s.io/code-generator v0.0.0-20230327162619-6533006896fa - k8s.io/component-base v0.0.0-20230327184055-11d07bf76eb4 + k8s.io/api v0.0.0 + k8s.io/apimachinery v0.0.0 + k8s.io/apiserver v0.0.0 + k8s.io/client-go v0.0.0 + k8s.io/code-generator v0.0.0 + k8s.io/component-base v0.0.0 k8s.io/klog/v2 v2.90.1 - k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a + k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f k8s.io/utils v0.0.0-20230209194617-a36077c30491 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd sigs.k8s.io/structured-merge-diff/v4 v4.2.3 @@ -120,16 +120,17 @@ require ( gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect - k8s.io/kms v0.0.0-20230315071547-f5c193c64781 // indirect + k8s.io/kms v0.0.0 // indirect sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.1 // indirect ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20230424183503-a94d26e5d6b7 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230315054728-8d1258da8f38 - k8s.io/apiserver => k8s.io/apiserver v0.0.0-20230427022934-df642d0ea44e - 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/kms => k8s.io/kms v0.0.0-20230315071547-f5c193c64781 + k8s.io/api => ../api + k8s.io/apiextensions-apiserver => ../apiextensions-apiserver + k8s.io/apimachinery => ../apimachinery + k8s.io/apiserver => ../apiserver + k8s.io/client-go => ../client-go + k8s.io/code-generator => ../code-generator + k8s.io/component-base => ../component-base + k8s.io/kms => ../kms ) diff --git a/go.sum b/go.sum index 823b95771..c946c6bc8 100644 --- a/go.sum +++ b/go.sum @@ -745,27 +745,13 @@ 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-20230315054728-8d1258da8f38 h1:n1qDRCTPAXwyXYg7eSpWDO9FdW79lwAQ9dAr1vETpn4= -k8s.io/apimachinery v0.0.0-20230315054728-8d1258da8f38/go.mod h1:5ikh59fK3AJ287GUvpUsryoMFtH9zj/ARfWCo3AyXTM= -k8s.io/apiserver v0.0.0-20230427022934-df642d0ea44e h1:WwEkGIGtsImF5SctLcQmlQaJyYqIDbXPFgSpBY4TN4Y= -k8s.io/apiserver v0.0.0-20230427022934-df642d0ea44e/go.mod h1:Lyf2Q845/OzzwGIA9WNTq/lyeqkluTQ+xK7omHrdHc0= -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/code-generator v0.0.0-20230327162619-6533006896fa h1:VWQJOJWMyEAIDkij54pPqRW7+c6krFTEoiVG9DfIA0s= -k8s.io/code-generator v0.0.0-20230327162619-6533006896fa/go.mod h1:iWtpm0ZMG6Gc4daWfITDSIu+WFhFJArYDhj242zcbnY= -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/gengo v0.0.0-20220902162205-c0856e24416d h1:U9tB195lKdzwqicbJvyJeOXV7Klv+wNAWENRnXEGi08= k8s.io/gengo v0.0.0-20220902162205-c0856e24416d/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw= k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/kms v0.0.0-20230315071547-f5c193c64781 h1:LH9Z43UgXQkuRc1ImiT3F3LoOfj9Xz0r1BP94+uYpys= -k8s.io/kms v0.0.0-20230315071547-f5c193c64781/go.mod h1:9rk1ftD6YM/h1KCjaoIZ8lv1CYvaCcuo57ZIWqiHHGI= -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/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=