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 42dac73d74
commit bdf6faf26b
2 changed files with 22 additions and 11 deletions

21
go.mod
View File

@ -5,18 +5,17 @@ module k8s.io/kube-controller-manager
go 1.16
require (
k8s.io/apimachinery v0.0.0
k8s.io/cloud-provider v0.0.0
k8s.io/controller-manager v0.0.0
k8s.io/apimachinery v0.0.0-20211006163404-6c4c0b383bc9
k8s.io/cloud-provider v0.0.0-20211109220539-3d7a196726e1
k8s.io/controller-manager v0.0.0-20211109220209-d44884a2f160
)
replace (
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/apiserver => ../apiserver
k8s.io/client-go => ../client-go
k8s.io/cloud-provider => ../cloud-provider
k8s.io/component-base => ../component-base
k8s.io/controller-manager => ../controller-manager
k8s.io/kube-controller-manager => ../kube-controller-manager
k8s.io/api => k8s.io/api v0.0.0-20211006163708-86d955a525a9
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211006163404-6c4c0b383bc9
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20211109211810-51a4bdcf8146
k8s.io/client-go => k8s.io/client-go v0.0.0-20211109205613-573578b082c8
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20211109220539-3d7a196726e1
k8s.io/component-base => k8s.io/component-base v0.0.0-20211109210603-eefdf6c8b8c2
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20211109220209-d44884a2f160
)

12
go.sum
View File

@ -595,6 +595,18 @@ 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/apiserver v0.0.0-20211109211810-51a4bdcf8146/go.mod h1:VKoPISO0x67pse8r9MUDelR2GE3SLFmESSvrOK/HYVA=
k8s.io/client-go v0.0.0-20211109205613-573578b082c8/go.mod h1:8cWprcK+5cmr/wPns68V73WC6AJZ8cwbvgsljwdvKcI=
k8s.io/cloud-provider v0.0.0-20211109220539-3d7a196726e1 h1:xBnEvNqY33YgGg/jz+uEkTurjjle9WtC+smDZpTgNlg=
k8s.io/cloud-provider v0.0.0-20211109220539-3d7a196726e1/go.mod h1:Yibf5HHke9dCykyjbRVe7S8c0ShHVnyRPCV947U+XvU=
k8s.io/component-base v0.0.0-20211109210603-eefdf6c8b8c2 h1:8m+ZnIl0CgLKr7XOfp8/wtEbEd9+Y7wvmjEjazKPYmQ=
k8s.io/component-base v0.0.0-20211109210603-eefdf6c8b8c2/go.mod h1:6kOmXP5/88F41HjA2VA+f8Lgd1ild8DOBMSZjYiRVRQ=
k8s.io/controller-manager v0.0.0-20211109220209-d44884a2f160 h1:nxtF2/BStG6XXlU+z4F27X3qrq18mojrKeoMODn0AyI=
k8s.io/controller-manager v0.0.0-20211109220209-d44884a2f160/go.mod h1:OQPXDUeMx6R9AxLt7AuOEMExmy1JxagZS2RU068PMkI=
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=