(chore): sort mirrored images to avoid controllerutil diff (#1780)

abhijith-darshan · web-flow · commit 3a68188630fc · 2026-02-05T13:12:47.000+01:00
(chore): use CreateOrPatch instead of update



(chore): use slices sort

Signed-off-by: abhijith-darshan &lt;abhijith.ravindra@sap.com&gt;
diff --git a/internal/controller/plugin/image_mirror.go b/internal/controller/plugin/image_mirror.go
@@ -6,6 +6,7 @@ package plugin
 import (
 	"fmt"
 	"regexp"
+	"slices"
 	"strings"
 
 	helmv2 "github.com/fluxcd/helm-controller/api/v2"
@@ -90,6 +91,7 @@ func extractUniqueImages(manifests string) []string {
 	for img := range seen {
 		images = append(images, img)
 	}
+	slices.Sort(images)
 	return images
 }
 
diff --git a/internal/controller/plugin/plugin_controller_flux.go b/internal/controller/plugin/plugin_controller_flux.go
@@ -156,7 +156,7 @@ func (r *PluginReconciler) ensureHelmRelease(
 		return fmt.Errorf("failed to generate HelmRelease values for Plugin %s: %w", plugin.Name, err)
 	}
 
-	result, err := ctrl.CreateOrUpdate(ctx, r.Client, release, func() error {
+	result, err := controllerutil.CreateOrPatch(ctx, r.Client, release, func() error {
 		builder := flux.NewHelmReleaseSpecBuilder().
 			WithChart(helmv2.HelmChartTemplateSpec{
 				Chart:    pluginDefinitionSpec.HelmChart.Name,

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ package plugin`
`6`	`6`	`import (`
`7`	`7`	`"fmt"`
`8`	`8`	`"regexp"`
	`9`	`+ "slices"`
`9`	`10`	`"strings"`
`10`	`11`
`11`	`12`	`helmv2 "github.com/fluxcd/helm-controller/api/v2"`
`@@ -90,6 +91,7 @@ func extractUniqueImages(manifests string) []string {`
`90`	`91`	`for img := range seen {`
`91`	`92`	`images = append(images, img)`
`92`	`93`	`}`
	`94`	`+ slices.Sort(images)`
`93`	`95`	`return images`
`94`	`96`	`}`
`95`	`97`
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ func (r *PluginReconciler) ensureHelmRelease(`
`156`	`156`	`return fmt.Errorf("failed to generate HelmRelease values for Plugin %s: %w", plugin.Name, err)`
`157`	`157`	`}`
`158`	`158`
`159`		`- result, err := ctrl.CreateOrUpdate(ctx, r.Client, release, func() error {`
	`159`	`+ result, err := controllerutil.CreateOrPatch(ctx, r.Client, release, func() error {`
`160`	`160`	`builder := flux.NewHelmReleaseSpecBuilder().`
`161`	`161`	`WithChart(helmv2.HelmChartTemplateSpec{`
`162`	`162`	`Chart: pluginDefinitionSpec.HelmChart.Name,`