Merge pull request #102656 from jsafrane/automated-cherry-pick-of-#102059-#101862-upstream-release-1.21

Automated cherry pick of #102059: Bump k8s.io/utils
#101862: Retry detaching FibreChannel volume few times

Kubernetes-commit: c96b0a28f310599a05f4dded9798b60718aa4094
This commit is contained in:
Kubernetes Publisher 2021-11-09 09:29:47 -08:00
parent 44a40b3484
commit 18012e84a8
2 changed files with 16 additions and 9 deletions

17
go.mod
View File

@ -5,17 +5,16 @@ module k8s.io/sample-controller
go 1.16
require (
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/client-go v0.0.0
k8s.io/code-generator v0.0.0
k8s.io/api v0.0.0-20211006163708-86d955a525a9
k8s.io/apimachinery v0.0.0-20211006163404-6c4c0b383bc9
k8s.io/client-go v0.0.0-20211109205613-573578b082c8
k8s.io/code-generator v0.0.0-20211109172947-12295a01b777
k8s.io/klog/v2 v2.9.0
)
replace (
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/client-go => ../client-go
k8s.io/code-generator => ../code-generator
k8s.io/sample-controller => ../sample-controller
k8s.io/api => k8s.io/api v0.0.0-20211006163708-86d955a525a9
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211006163404-6c4c0b383bc9
k8s.io/client-go => k8s.io/client-go v0.0.0-20211109205613-573578b082c8
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20211109172947-12295a01b777
)

8
go.sum
View File

@ -420,6 +420,14 @@ 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-20211006163708-86d955a525a9 h1:fgsa+Z/Z0SKWRq6ptOqaQsxgSW0/VzFQUlDksN4tnu0=
k8s.io/api v0.0.0-20211006163708-86d955a525a9/go.mod h1:Qj3SN+1Iyz/YY45v5zFHtGeMTDma1zNbjEE5tjjtRqc=
k8s.io/apimachinery v0.0.0-20211006163404-6c4c0b383bc9 h1:IIhOqTAjGOnbZAV2xL43WdlYP0ytfhqans3r+90NwJQ=
k8s.io/apimachinery v0.0.0-20211006163404-6c4c0b383bc9/go.mod h1:cIJZ64G7RXojne0VMbraJhyZENr8Bep45PAX1zJlfLQ=
k8s.io/client-go v0.0.0-20211109205613-573578b082c8 h1:2lHcLVUsFHSTMnpn/QnR8b+M+oJ3G+BmGFOpomqN/yE=
k8s.io/client-go v0.0.0-20211109205613-573578b082c8/go.mod h1:8cWprcK+5cmr/wPns68V73WC6AJZ8cwbvgsljwdvKcI=
k8s.io/code-generator v0.0.0-20211109172947-12295a01b777 h1:E0+i6hE8LcqVGlyU7SG0K/S4r7VASO50bRmCW/TioJk=
k8s.io/code-generator v0.0.0-20211109172947-12295a01b777/go.mod h1:1rjClMZOJxt64EX39Cxs1M60KWy6l9D716HBuy5eWfg=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027 h1:Uusb3oh8XcdzDF/ndlI4ToKTYVlkCSJP39SRY2mfRAw=
k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=