Use UniqueApplyForResourceVersion in Bundle and GitRepo GeneratingHan…

…dlers
rancher · Jan 12, 2024 · b4a5b24 · b4a5b24
1 parent 3eefdcc
commit b4a5b24
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/internal/cmd/controller/controllers/bundle/controller.go b/internal/cmd/controller/controllers/bundle/controller.go
@@ -70,7 +70,8 @@ func Register(ctx context.Context,
 		"bundle",
 		h.OnBundleChange,
 		&generic.GeneratingHandlerOptions{
-			AllowClusterScoped: true,
+			AllowClusterScoped:            true,
+			UniqueApplyForResourceVersion: true,
 		})
 
 	relatedresource.Watch(ctx, "app", h.resolveBundle, bundles, bundleDeployments)

diff --git a/internal/cmd/controller/controllers/git/git.go b/internal/cmd/controller/controllers/git/git.go
@@ -24,6 +24,7 @@ import (
 	v1 "github.com/rancher/gitjob/pkg/generated/controllers/gitjob.cattle.io/v1"
 	"github.com/rancher/wrangler/v2/pkg/apply"
 	corev1controller "github.com/rancher/wrangler/v2/pkg/generated/controllers/core/v1"
+	"github.com/rancher/wrangler/v2/pkg/generic"
 	"github.com/rancher/wrangler/v2/pkg/genericcondition"
 	"github.com/rancher/wrangler/v2/pkg/kv"
 	"github.com/rancher/wrangler/v2/pkg/name"
@@ -66,7 +67,15 @@ func Register(ctx context.Context,
 
 	gitRepos.OnChange(ctx, "gitjob-purge", h.DeleteOnChange)
 	// this will update the lastUpdateTime of the Accepted condition
-	fleetcontrollers.RegisterGitRepoGeneratingHandler(ctx, gitRepos, apply, "Accepted", "gitjobs", h.OnChange, nil)
+	fleetcontrollers.RegisterGitRepoGeneratingHandler(
+		ctx,
+		gitRepos,
+		apply,
+		"Accepted",
+		"gitjobs",
+		h.OnChange,
+		&generic.GeneratingHandlerOptions{UniqueApplyForResourceVersion: true},
+	)
 	// enqueue gitrepo when gitjob changes
 	relatedresource.Watch(ctx, "gitjobs",
 		relatedresource.OwnerResolver(true, fleet.SchemeGroupVersion.String(), "GitRepo"), gitRepos, gitJobs)