Merge pull request #111224 from mpuckett159/revert-110923-fix/add-wait-timers

Revert "Move kubectl wait to informers with a cache to avoid hanging due to objects disappearing from the cluster"

Kubernetes-commit: 2694137bfd19730d737ca857631fe18bbbf98767
This commit is contained in:
Kubernetes Publisher 2022-07-18 15:37:07 -07:00
parent d9fb1ec8c6
commit 0c42a8e996
2 changed files with 12 additions and 12 deletions

12
go.mod
View File

@ -30,10 +30,10 @@ require (
github.com/stretchr/testify v1.7.0
golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.0.0-20220714130747-08c75a7ce2b0
k8s.io/apimachinery v0.0.0-20220714130549-afc5e00a762a
k8s.io/api v0.0.0-20220722161207-096c9df2b1e5
k8s.io/apimachinery v0.0.0-20220715210607-cff14a57b273
k8s.io/cli-runtime v0.0.0-20220714133411-4661c56a3b88
k8s.io/client-go v0.0.0-20220714131101-743e29dc1f0a
k8s.io/client-go v0.0.0-20220715211111-c6bd30b9ec5f
k8s.io/component-base v0.0.0-20220714131716-acb17c407a9a
k8s.io/component-helpers v0.0.0-20220714131824-2112f4afdc41
k8s.io/klog/v2 v2.70.1
@ -94,10 +94,10 @@ require (
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20220714130747-08c75a7ce2b0
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220714130549-afc5e00a762a
k8s.io/api => k8s.io/api v0.0.0-20220722161207-096c9df2b1e5
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220715210607-cff14a57b273
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20220714133411-4661c56a3b88
k8s.io/client-go => k8s.io/client-go v0.0.0-20220714131101-743e29dc1f0a
k8s.io/client-go => k8s.io/client-go v0.0.0-20220715211111-c6bd30b9ec5f
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20220714130400-40a88eb49f4e
k8s.io/component-base => k8s.io/component-base v0.0.0-20220714131716-acb17c407a9a
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20220714131824-2112f4afdc41

12
go.sum
View File

@ -741,14 +741,14 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
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=
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20220714130747-08c75a7ce2b0 h1:1+Gb0Kje9jZR8hx0edzFB8oNBjzm5kc/UbOoISwoEU8=
k8s.io/api v0.0.0-20220714130747-08c75a7ce2b0/go.mod h1:xlTZXhM5RKsAvY03javUnK13iE/4mnhKPPE4oPaILYs=
k8s.io/apimachinery v0.0.0-20220714130549-afc5e00a762a h1:XUzD47aXgkqvEXou0LNGFWqgLJ9U7TqmLAJ/0MOlPRw=
k8s.io/apimachinery v0.0.0-20220714130549-afc5e00a762a/go.mod h1:CNcND3K8ABL1dV2TGPzpp/lCzp9PRs+3Wo/Xn4dxzxA=
k8s.io/api v0.0.0-20220722161207-096c9df2b1e5 h1:b/hnNZkm+3G4euPDgrtSZ1N++B690LP192H2PmGr7tY=
k8s.io/api v0.0.0-20220722161207-096c9df2b1e5/go.mod h1:T8MHEjNPDTNfRwP5bawgzpmK7k3NMdSd2grr9aNemC0=
k8s.io/apimachinery v0.0.0-20220715210607-cff14a57b273 h1:IL+NsyWP9+VKUqvJnCbf/nqFSnRR4lVGR5yjkip3NJo=
k8s.io/apimachinery v0.0.0-20220715210607-cff14a57b273/go.mod h1:CNcND3K8ABL1dV2TGPzpp/lCzp9PRs+3Wo/Xn4dxzxA=
k8s.io/cli-runtime v0.0.0-20220714133411-4661c56a3b88 h1:IRFN8z2oRiGALYJZcMLugUheMr3w2NyOXRVc3jiecD8=
k8s.io/cli-runtime v0.0.0-20220714133411-4661c56a3b88/go.mod h1:xXsp2d7SMrosoNbs4oS+2pRlN3A5Pd2GlFR8iUQAkjM=
k8s.io/client-go v0.0.0-20220714131101-743e29dc1f0a h1:jmfQ6N1hjrgM/Y2W7i9z95ocSfctuV/gpS1zPvyE+k0=
k8s.io/client-go v0.0.0-20220714131101-743e29dc1f0a/go.mod h1:WpSp0Vib2IbNV6MjJ+6HC9ZyTJEBRvxNR0RJgku9apY=
k8s.io/client-go v0.0.0-20220715211111-c6bd30b9ec5f h1:p8YuTwiKFA5PKnu0XYIphz4det9S39jzModfPJPXyc0=
k8s.io/client-go v0.0.0-20220715211111-c6bd30b9ec5f/go.mod h1:szcc5YXJE3AEu7S25/hJ8vyY8bO0Y1dFXXtZg9bxOgg=
k8s.io/component-base v0.0.0-20220714131716-acb17c407a9a h1:+sKIctbiUvvbONvh+V3P/2o/On+rswzPQtlYy2FP1QY=
k8s.io/component-base v0.0.0-20220714131716-acb17c407a9a/go.mod h1:9X3wSxKWZLoacQ68qaPexkD3Qnmr1HZUg93mjxxfEsg=
k8s.io/component-helpers v0.0.0-20220714131824-2112f4afdc41 h1:Nz8EOtEp+c2hOcIEkxnMZbsWJImmNLJdCVi1yYR46WQ=