From 1cfd3d86aaa0a2512f369fe7e4d35415b425b39b Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Mon, 13 Dec 2021 09:52:27 -0800 Subject: [PATCH] Merge pull request #106835 from cpanato/go117-release-1-23 [go1.17] Update to go1.17.5 and golang.org/x/net to v0.0.0-20211209124913-491a49abca63 Kubernetes-commit: 08ad4f287316f941988fe1e1b8f425cded157048 --- go.mod | 7 ++----- go.sum | 2 ++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index f0cd56596f..cdb0858695 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-20211213212122-4427f8f31dfb ) -replace ( - k8s.io/api => ../api - k8s.io/apimachinery => ../apimachinery -) +replace k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211213212122-4427f8f31dfb diff --git a/go.sum b/go.sum index b877e0b9c8..889d1a77cf 100644 --- a/go.sum +++ b/go.sum @@ -221,6 +221,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-20211213212122-4427f8f31dfb h1:0Ar7cEgnQUYRPlb5q6qIPkYPew3nilbL3v2ziJCfVZ4= +k8s.io/apimachinery v0.0.0-20211213212122-4427f8f31dfb/go.mod h1:SADt2Kl8/sttJ62RRsi9MIV4o8f5S3coArm0Iu3fBno= 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=