From 79120fd8e4d15fe4f9d199b63b5c2026e34549a4 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Wed, 10 Nov 2021 15:45:50 -0800 Subject: [PATCH] Merge pull request #106250 from ulucinar/bump-k-openapi-1.22 Manual cherry pick of kube-openapi changes for release-1.22 Kubernetes-commit: b01dafb504ddb82292ba0bd521a5053bacfebc05 --- go.mod | 7 ++----- go.sum | 2 ++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index f0cd56596f..4734581a7a 100644 --- a/go.mod +++ b/go.mod @@ -7,10 +7,7 @@ go 1.16 require ( github.com/gogo/protobuf v1.3.2 github.com/stretchr/testify v1.7.0 - k8s.io/apimachinery v0.0.0 + k8s.io/apimachinery v0.0.0-20211111072429-e757da007984 ) -replace ( - k8s.io/api => ../api - k8s.io/apimachinery => ../apimachinery -) +replace k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211111072429-e757da007984 diff --git a/go.sum b/go.sum index 9ea0cb933b..03cd19a079 100644 --- a/go.sum +++ b/go.sum @@ -207,6 +207,8 @@ gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/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/apimachinery v0.0.0-20211111072429-e757da007984 h1:u5XdyAqEOwp6+EuYFY3FubMb73J8ombCb7CBXMIWi+E= +k8s.io/apimachinery v0.0.0-20211111072429-e757da007984/go.mod h1:yU6oA6Gnax9RrxGzVvPFFJ+mpnW6PBSqp0sx0I0HHW0= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.9.0 h1:D7HV+n1V57XeZ0m6tdRkfknthUaM06VFbWldOFh8kzM=