From 6708a8888d24fb3badf64b150d6fc255f943c627 Mon Sep 17 00:00:00 2001 From: Alex Zielenski Date: Thu, 24 Mar 2022 14:01:01 -0700 Subject: [PATCH] Update kube-openapi (#108895) * upgrade k8s.io/kube-openapi * fix open-api v3 blank aggregator output * use keys as API group in ./hack/update-openapi-spec.sh * fix import grouping * update openapiv3 integration tests Kubernetes-commit: 11b3a18cca745485e1033be8d62a1d0cde5a1d1d --- go.mod | 18 +++++++++--------- go.sum | 20 ++++++++++---------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/go.mod b/go.mod index 68d5e68e7..63f69fcfa 100644 --- a/go.mod +++ b/go.mod @@ -44,12 +44,12 @@ require ( google.golang.org/grpc v1.40.0 gopkg.in/natefinch/lumberjack.v2 v2.0.0 gopkg.in/square/go-jose.v2 v2.2.2 - k8s.io/api v0.0.0-20220324090948-252596ff4b82 - k8s.io/apimachinery v0.0.0-20220324090745-7300632adf34 - k8s.io/client-go v0.0.0-20220324171229-f4f092dbe05b - k8s.io/component-base v0.0.0-20220324091809-1ed05ebc2388 + k8s.io/api v0.0.0-20220324210930-df53a95c65aa + k8s.io/apimachinery v0.0.0-20220324210734-b68ae5efb0e8 + k8s.io/client-go v0.0.0-20220324211221-af0252eed9c0 + k8s.io/component-base v0.0.0-20220324211736-57e5b231b63e k8s.io/klog/v2 v2.60.1 - k8s.io/kube-openapi v0.0.0-20220316025549-ddc66922ab18 + k8s.io/kube-openapi v0.0.0-20220323210520-29d726468e05 k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30 sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 @@ -58,8 +58,8 @@ require ( ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20220324090948-252596ff4b82 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220324090745-7300632adf34 - k8s.io/client-go => k8s.io/client-go v0.0.0-20220324171229-f4f092dbe05b - k8s.io/component-base => k8s.io/component-base v0.0.0-20220324091809-1ed05ebc2388 + k8s.io/api => k8s.io/api v0.0.0-20220324210930-df53a95c65aa + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220324210734-b68ae5efb0e8 + k8s.io/client-go => k8s.io/client-go v0.0.0-20220324211221-af0252eed9c0 + k8s.io/component-base => k8s.io/component-base v0.0.0-20220324211736-57e5b231b63e ) diff --git a/go.sum b/go.sum index baf24198d..336e00d83 100644 --- a/go.sum +++ b/go.sum @@ -954,21 +954,21 @@ 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-20220324090948-252596ff4b82 h1:JzyceRELIVLSbRvRGVMFsBF3TMLz654zQ7o9f+BTwAA= -k8s.io/api v0.0.0-20220324090948-252596ff4b82/go.mod h1:JqmWcTc8w/f9H6FAID3aXgcs3r23s/WDUoSYelnyMzU= -k8s.io/apimachinery v0.0.0-20220324090745-7300632adf34 h1:SsC1YncL6JXgQ58/38HUQNgloOpepqST88xg7uqNAGQ= -k8s.io/apimachinery v0.0.0-20220324090745-7300632adf34/go.mod h1:PgkO8eNLIN6yNjdRAueHZRbNd08wHC7Y40ooODLbuWA= -k8s.io/client-go v0.0.0-20220324171229-f4f092dbe05b h1:VXWs1cwIE6JpgSM5neWBBkyNJtTNMhqHKzbJreCF09o= -k8s.io/client-go v0.0.0-20220324171229-f4f092dbe05b/go.mod h1:7gIIunmAuzeVK4wOc0IIHmTphO31irvImN4hratKEwQ= -k8s.io/component-base v0.0.0-20220324091809-1ed05ebc2388 h1:TDzZ//+QLGQsNKxK4N5Fq6W0cFoR6PbOp8/FyfmhNTw= -k8s.io/component-base v0.0.0-20220324091809-1ed05ebc2388/go.mod h1:3mhEYZ85I6PjKzStvGIhq74eHrW7WTLy7uOzuih/n1s= +k8s.io/api v0.0.0-20220324210930-df53a95c65aa h1:NzCktMsy22Y/ddoBN/kf96kFaklITIHNfA1sRv6UofA= +k8s.io/api v0.0.0-20220324210930-df53a95c65aa/go.mod h1:Ea6ReZGsqdWOZc66t7sHO58lTcUGyQcMJ3UfsqOnKfM= +k8s.io/apimachinery v0.0.0-20220324210734-b68ae5efb0e8 h1:LULUz36bFy2WqAjJVZAbn4yVJ92Xn7oBaUCF6BR8HDk= +k8s.io/apimachinery v0.0.0-20220324210734-b68ae5efb0e8/go.mod h1:V4ECjDypP1xQpnL3N9yFzlbGZgd8tLKouJnRyAn/Zyw= +k8s.io/client-go v0.0.0-20220324211221-af0252eed9c0 h1:1CEitsCQXwuKQ22HYRYCgZPi0+3RXCQsiQlOAkkGAAI= +k8s.io/client-go v0.0.0-20220324211221-af0252eed9c0/go.mod h1:sVLZTMIBHUCD7MFbyyUPejZNIlOLYZ2aZcZuP0z1aI0= +k8s.io/component-base v0.0.0-20220324211736-57e5b231b63e h1:pePHRxtCQPR8KBavUnbJAfE0rFA0Puw1LnLbnf7FQxo= +k8s.io/component-base v0.0.0-20220324211736-57e5b231b63e/go.mod h1:LjoWPAiUCxIihcolqcjyz3asLrh4xhhj7po1yj7Zpw0= k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.60.1 h1:VW25q3bZx9uE3vvdL6M8ezOX79vA2Aq1nEWLqNQclHc= k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/kube-openapi v0.0.0-20220316025549-ddc66922ab18 h1:M0Korml79JW27ndc6lxLxkNP8QVqdpBj0MIEZliKy8A= -k8s.io/kube-openapi v0.0.0-20220316025549-ddc66922ab18/go.mod h1:p8bjuqy9+BWvBDEBjdeVYtX6kMWWg6OhY1V1jhC9MPI= +k8s.io/kube-openapi v0.0.0-20220323210520-29d726468e05 h1:HC/IqdsYa2juhSDWUEO/MGxGcyUMSMX+aynZ5WcJZeg= +k8s.io/kube-openapi v0.0.0-20220323210520-29d726468e05/go.mod h1:Z/45zLw8lUo4wdiUkI+v/ImEGAvu3WatcZl3lPMR4Rk= k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 h1:HNSDgDCrr/6Ly3WEGKZftiE7IY19Vz2GdbOCyI4qqhc= k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=