Skip to content

Commit 77130d2

Browse files
committed
refactor: dont use legacy multitracker in Helm actions, unless tracking for elimination
Signed-off-by: Ilya Lesikov <[email protected]>
1 parent 17dd24e commit 77130d2

File tree

1 file changed

+0
-12
lines changed

1 file changed

+0
-12
lines changed

pkg/kube/client.go

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -299,10 +299,6 @@ func getResource(info *resource.Info) (runtime.Object, error) {
299299

300300
// Wait waits up to the given timeout for the specified resources to be ready.
301301
func (c *Client) Wait(resources ResourceList, timeout time.Duration) error {
302-
if c.ResourcesWaiter != nil {
303-
return c.ResourcesWaiter.Wait(context.Background(), resources, timeout)
304-
}
305-
306302
cs, err := c.getKubeClient()
307303
if err != nil {
308304
return err
@@ -318,10 +314,6 @@ func (c *Client) Wait(resources ResourceList, timeout time.Duration) error {
318314

319315
// WaitWithJobs wait up to the given timeout for the specified resources to be ready, including jobs.
320316
func (c *Client) WaitWithJobs(resources ResourceList, timeout time.Duration) error {
321-
if c.ResourcesWaiter != nil {
322-
return c.ResourcesWaiter.Wait(context.Background(), resources, timeout)
323-
}
324-
325317
cs, err := c.getKubeClient()
326318
if err != nil {
327319
return err
@@ -618,10 +610,6 @@ func (c *Client) watchTimeout(t time.Duration) func(*resource.Info) error {
618610
//
619611
// Handling for other kinds will be added as necessary.
620612
func (c *Client) WatchUntilReady(resources ResourceList, timeout time.Duration) error {
621-
if c.ResourcesWaiter != nil {
622-
return c.ResourcesWaiter.WatchUntilReady(context.Background(), resources, timeout)
623-
}
624-
625613
// For jobs, there's also the option to do poll c.Jobs(namespace).Get():
626614
// https://github.com/adamreese/kubernetes/blob/master/test/e2e/job.go#L291-L300
627615
return perform(resources, c.watchTimeout(timeout))

0 commit comments

Comments
 (0)