Merge pull request #108520 from heybronson/automated-cherry-pick-of-#107764-upstream-release-1.22

Automated cherry pick of #107764: wrap error from RunCordonOrUncordon

Kubernetes-commit: 50d063fbd91a12e83e02afbb78c247cb4e25e691
This commit is contained in:
Kubernetes Publisher 2022-03-23 02:40:01 -07:00
parent 84e93c0ed5
commit e7edbd6393
2 changed files with 4 additions and 4 deletions

4
go.mod
View File

@ -31,7 +31,7 @@ require (
github.com/stretchr/testify v1.7.0
golang.org/x/sys v0.0.0-20210616094352-59db8d763f22
gopkg.in/yaml.v2 v2.4.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/cli-runtime v0.0.0-20220124181257-63958bedee04
k8s.io/client-go v0.0.0-20220124172954-be23bb76ca28
@ -47,7 +47,7 @@ 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
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20220124181257-63958bedee04
k8s.io/client-go => k8s.io/client-go v0.0.0-20220124172954-be23bb76ca28

4
go.sum
View File

@ -737,8 +737,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/cli-runtime v0.0.0-20220124181257-63958bedee04 h1:8FSpvmBRuwBAITpxgu703lU8AOlEGolO6Ri8/Hfwekg=