Skip to content

Commit 039b2cf

Browse files
authored
Merge pull request #219 from kyriba/set-reconciliation-timeout
2 parents a224394 + 2851c85 commit 039b2cf

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

pkg/controller/applications/controller.go

+2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package applications
1818

1919
import (
2020
"context"
21+
"time"
2122

2223
"github.com/argoproj/argo-cd/v2/pkg/apiclient"
2324
"github.com/argoproj/argo-cd/v2/pkg/apiclient/application"
@@ -64,6 +65,7 @@ func SetupApplication(mgr ctrl.Manager, o xpcontroller.Options) error {
6465
managed.WithLogger(o.Logger.WithValues("controller", name)),
6566
managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))),
6667
managed.WithConnectionPublishers(cps...),
68+
managed.WithTimeout(5 * time.Minute),
6769
}
6870

6971
if o.Features.Enabled(features.EnableBetaManagementPolicies) {

0 commit comments

Comments
 (0)