Skip to content

Commit 3361a3d

Browse files
committed
fix(exp-engine): use new Waiter API
Signed-off-by: Ilya Lesikov <ilya@lesikov.com>
1 parent 9814ed4 commit 3361a3d

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

cmd/werf/converge/converge.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,11 @@ func run(ctx context.Context, containerBackend container_backend.ContainerBacken
556556
return fmt.Errorf("error initializing deferred kube client: %w", err)
557557
}
558558

559-
waiter := resourcewaiter.NewResourceWaiter(deferredKubeClient.Dynamic(), deferredKubeClient.Mapper())
559+
trackTimeout := *common.NewDuration(time.Duration(cmdData.Timeout) * time.Second)
560+
waiter := resourcewaiter.NewResourceWaiter(deferredKubeClient.Dynamic(), deferredKubeClient.Mapper(), resourcewaiter.NewResourceWaiterOptions{
561+
Logger: logger,
562+
DefaultTrackTimeout: trackTimeout,
563+
})
560564

561565
statusProgressPeriod := time.Duration(*commonCmdData.StatusProgressPeriodSeconds) * time.Second
562566
hooksStatusProgressPeriod := time.Duration(*commonCmdData.HooksStatusProgressPeriodSeconds) * time.Second
@@ -571,7 +575,6 @@ func run(ctx context.Context, containerBackend container_backend.ContainerBacken
571575
mutator.NewReplicasOnCreationMutator(),
572576
mutator.NewReleaseMetadataMutator(releaseName, namespace),
573577
)
574-
trackTimeout := *common.NewDuration(time.Duration(cmdData.Timeout) * time.Second)
575578
cli.SetDeletionTimeout(int(trackTimeout))
576579

577580
// FIXME(ilya-lesikov): move some of it out of lock release wrapper

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,6 @@ replace (
347347
github.com/helm/helm-2to3 => github.com/werf/3p-helm-2to3 v0.0.0-20230313155428-cf9dd655c0e3 // switch back to upstream when merged: https://github.com/helm/helm-2to3/pull/224
348348
github.com/jaguilar/vt100 => github.com/tonistiigi/vt100 v0.0.0-20190402012908-ad4c4a574305 // upstream not maintained
349349
github.com/maorfr/helm-plugin-utils => github.com/werf/3p-helm-plugin-utils v0.6.1-0.20230313152239-057595ce9d57 // switch back to upstream when merged: https://github.com/maorfr/helm-plugin-utils/pull/17
350-
helm.sh/helm/v3 => github.com/werf/3p-helm/v3 v3.0.0-20230721124034-069d446f230a
350+
helm.sh/helm/v3 => github.com/werf/3p-helm/v3 v3.0.0-20230721125930-595aa78112f5
351351
k8s.io/helm => github.com/werf/helm v0.0.0-20210202111118-81e74d46da0f
352352
)

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1740,8 +1740,8 @@ github.com/weppos/publicsuffix-go v0.5.0/go.mod h1:z3LCPQ38eedDQSwmsSRW4Y7t2L8Ln
17401740
github.com/weppos/publicsuffix-go v0.20.1-0.20221209102050-40d9c30084b3 h1:ypyhoprZWFzU0ydOBv3I5SS7/jLFJ+ujPAU+BD/EVFM=
17411741
github.com/werf/3p-helm-2to3 v0.0.0-20230313155428-cf9dd655c0e3 h1:pdKLiuiUoOFswc0HV6GX1+JHgP14HqE035xl2DQJi8A=
17421742
github.com/werf/3p-helm-2to3 v0.0.0-20230313155428-cf9dd655c0e3/go.mod h1:lTSQBLomjl67m4HQMbg3BHKWes3pOmjNBg8yygXYugk=
1743-
github.com/werf/3p-helm/v3 v3.0.0-20230721124034-069d446f230a h1:Rl/eBUlHoPqd0DQo4HXBo851ct/3JOW2fMA15I/2jBE=
1744-
github.com/werf/3p-helm/v3 v3.0.0-20230721124034-069d446f230a/go.mod h1:vH6ckglZT6mhJefVLbUM9759Zt/wQnqqRe0BY4jmmHM=
1743+
github.com/werf/3p-helm/v3 v3.0.0-20230721125930-595aa78112f5 h1:ABh2GLSHga60eCodqBlLPzy46qMFX3u3wNlUP7vIHbk=
1744+
github.com/werf/3p-helm/v3 v3.0.0-20230721125930-595aa78112f5/go.mod h1:vH6ckglZT6mhJefVLbUM9759Zt/wQnqqRe0BY4jmmHM=
17451745
github.com/werf/copy-recurse v0.2.7 h1:3FTOarbJ9uhFLi75oeUCioK9zxZwuV7o28kuUBPDZPM=
17461746
github.com/werf/copy-recurse v0.2.7/go.mod h1:6Ypb+qN+hRBJgoCgEkX1vpbqcQ+8q69BQ3hi8s8Y6Qc=
17471747
github.com/werf/helm v0.0.0-20210202111118-81e74d46da0f h1:81YscYTF9mmTf0ULOsCmm42YWQp+qWDzWi1HjWniZrg=

0 commit comments

Comments
 (0)