From cb56b77b7472215b95f9347455326110557f0a35 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Wed, 10 Jan 2024 13:07:23 +0100 Subject: [PATCH] Merge pull request #122559 from Jefftree/automated-cherry-pick-of-#122346-upstream-release-1.29 Automated cherry pick of #122346: Make OpenAPIGetter tolerant of nil Kubernetes-commit: 73b4bf2f9d20d7a30fa8443e8f6673e7eb86a991 --- go.mod | 6 +++--- go.sum | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 023d19d45..723b23433 100644 --- a/go.mod +++ b/go.mod @@ -30,7 +30,7 @@ require ( github.com/stretchr/testify v1.8.4 golang.org/x/sys v0.13.0 gopkg.in/yaml.v2 v2.4.0 - k8s.io/api v0.0.0-20231128184855-0099855f0340 + k8s.io/api v0.0.0-20231206041426-0d77c3467e29 k8s.io/apimachinery v0.0.0-20231128183834-3c8c1f22dc33 k8s.io/cli-runtime v0.0.0-20231128203254-907531b39be5 k8s.io/client-go v0.0.0-20231128190455-288368e416e4 @@ -96,11 +96,11 @@ require ( ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20231128184855-0099855f0340 + k8s.io/api => k8s.io/api v0.0.0-20231206041426-0d77c3467e29 k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20231128183834-3c8c1f22dc33 k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20231128203254-907531b39be5 k8s.io/client-go => k8s.io/client-go v0.0.0-20231128190455-288368e416e4 - k8s.io/code-generator => k8s.io/code-generator v0.0.0-20231113170942-51ae00d9f6ec + k8s.io/code-generator => k8s.io/code-generator v0.0.0-20231120145104-599d00c53adf k8s.io/component-base => k8s.io/component-base v0.0.0-20231128191614-d0ec94f2e2e3 k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20231128192101-4f38c3931fbe k8s.io/metrics => k8s.io/metrics v0.0.0-20231128202703-27579b8b092f diff --git a/go.sum b/go.sum index 1f93b798a..2d53fffdb 100644 --- a/go.sum +++ b/go.sum @@ -282,8 +282,8 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -k8s.io/api v0.0.0-20231128184855-0099855f0340 h1:k4Nf1p8ZaNJb7b/YyW2OiYaqlA40cV/ONVlRLYyuIcI= -k8s.io/api v0.0.0-20231128184855-0099855f0340/go.mod h1:ok1gcRNjuV0Z+WBZfANtcTYPDUUB+ce3fkv3IkrBB1s= +k8s.io/api v0.0.0-20231206041426-0d77c3467e29 h1:1nEAqGo/rDyevufKfknvNr6ZO23LB33zRP6Ms49uXOc= +k8s.io/api v0.0.0-20231206041426-0d77c3467e29/go.mod h1:ok1gcRNjuV0Z+WBZfANtcTYPDUUB+ce3fkv3IkrBB1s= k8s.io/apimachinery v0.0.0-20231128183834-3c8c1f22dc33 h1:rBhSfzKWKi9WyN1t7+IULBAzyQ88DyfBBUu0KtlqbuI= k8s.io/apimachinery v0.0.0-20231128183834-3c8c1f22dc33/go.mod h1:eVBxQ/cwiJxH58eK/jd/vAk4mrxmVlnpBH5J2GbMeis= k8s.io/cli-runtime v0.0.0-20231128203254-907531b39be5 h1:4u+smgSy5x4edih0nBpGpF/+WWujSi16wCRXGtHh25Q=