Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: crossplane-contrib/provider-argocd
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.9.1
Choose a base ref
...
head repository: crossplane-contrib/provider-argocd
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v0.9.2
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Dec 3, 2024

  1. Set reconciliation timeout 5 min for application controller 

    Signed-off-by: vbuko <[email protected]>
(cherry picked from commit 2851c85)
    @github-actions
    vbuko authored and github-actions[bot] committed Dec 3, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    be7fab0 View commit details

  2. Merge pull request #221 from crossplane-contrib/backport-219-to-relea… 

    …se-0.9
    @MisterMX
    MisterMX authored Dec 3, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    177d509 View commit details
Showing with 2 additions and 0 deletions.
  1. +2 −0 pkg/controller/applications/controller.go
2 changes: 2 additions & 0 deletions pkg/controller/applications/controller.go
View file
Original file line number Diff line number Diff line change
@@ -18,6 +18,7 @@ package applications

import (
"context"
"time"

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

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