From 48190f8df67b478899d4ae212cf93d131ed1570a Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Thu, 11 Aug 2022 06:02:58 -0700 Subject: [PATCH] Merge pull request #111272 from Abirdcfly/automated-cherry-pick-of-#111235-upstream-release-1.22 Automated cherry pick of #111235: fix a possible panic because of taking the address of nil Kubernetes-commit: cdfdbd03d6b159e8a765b7872363dce068dd785c --- go.mod | 4 ++-- go.sum | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index eb2d00efe..0f8fde425 100644 --- a/go.mod +++ b/go.mod @@ -30,7 +30,7 @@ require ( golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac google.golang.org/protobuf v1.26.0 - k8s.io/api v0.0.0-20220115132223-0b924f4f7b63 + k8s.io/api v0.0.0-20220222193716-39d32415443c k8s.io/apimachinery v0.0.0-20220115131919-1ea05acba7c0 k8s.io/klog/v2 v2.9.0 k8s.io/utils v0.0.0-20211116205334-6203023598ed @@ -39,6 +39,6 @@ require ( ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20220115132223-0b924f4f7b63 + k8s.io/api => k8s.io/api v0.0.0-20220222193716-39d32415443c k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220115131919-1ea05acba7c0 ) diff --git a/go.sum b/go.sum index af5949278..7cb515d71 100644 --- a/go.sum +++ b/go.sum @@ -444,8 +444,8 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= 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= -k8s.io/api v0.0.0-20220115132223-0b924f4f7b63 h1:ARkTMQaUQg/XAxZGClgPO8jLBGe+0vyHOzkv1klocn4= -k8s.io/api v0.0.0-20220115132223-0b924f4f7b63/go.mod h1:VZ3awwdNsOtdAUAYPvruiFtrH/OD4gT5qmZHaQmXgxY= +k8s.io/api v0.0.0-20220222193716-39d32415443c h1:7uKzkkSldmiACEmFGRb0+RdhsZShf8z4pC+523YGlRE= +k8s.io/api v0.0.0-20220222193716-39d32415443c/go.mod h1:VZ3awwdNsOtdAUAYPvruiFtrH/OD4gT5qmZHaQmXgxY= k8s.io/apimachinery v0.0.0-20220115131919-1ea05acba7c0 h1:SoF7jCfsIaGo2y+PiJGjFnRMeGh4zO4aGEYc0IVGAu4= k8s.io/apimachinery v0.0.0-20220115131919-1ea05acba7c0/go.mod h1:ZvVLP5iLhwVFg2Yx9Gh5W0um0DUauExbRhe+2Z8I1EU= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=