From 4ab47030aa3760f12171d8478e67df7a086c76e4 Mon Sep 17 00:00:00 2001 From: Matheus Pimenta Date: Tue, 27 Jan 2026 18:33:46 +0000 Subject: [PATCH 1/3] Test CI with controller-runtime v0.22.4 This is a test commit to verify the upgrade-fail-remediate-uninstall e2e test passes with controller-runtime v0.22.4 (before the v0.23.0 upgrade). Co-Authored-By: Claude Opus 4.5 --- internal/reconcile/atomic_release.go | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/reconcile/atomic_release.go b/internal/reconcile/atomic_release.go index 2e7444965..5283ef857 100644 --- a/internal/reconcile/atomic_release.go +++ b/internal/reconcile/atomic_release.go @@ -1,5 +1,6 @@ /* Copyright 2022 The Flux authors +Test CI with controller-runtime v0.22.4 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. From b1d200d63be34236a84bfd84093c1b0ea6f2297e Mon Sep 17 00:00:00 2001 From: Matheus Pimenta Date: Tue, 27 Jan 2026 18:51:42 +0000 Subject: [PATCH 2/3] Upgrade controller-runtime to v0.23.0 Testing if the upgrade-fail-remediate-uninstall e2e test fails with controller-runtime v0.23.0 due to stricter terminal error handling. Co-Authored-By: Claude Opus 4.5 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 32b2b8e57..a41a8867d 100644 --- a/go.mod +++ b/go.mod @@ -49,7 +49,7 @@ require ( k8s.io/client-go v0.35.0 k8s.io/kubectl v0.35.0 k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 - sigs.k8s.io/controller-runtime v0.22.4 + sigs.k8s.io/controller-runtime v0.23.0 sigs.k8s.io/kustomize/api v0.21.0 sigs.k8s.io/kustomize/kyaml v0.21.0 sigs.k8s.io/yaml v1.6.0 diff --git a/go.sum b/go.sum index 043039de0..ac1019463 100644 --- a/go.sum +++ b/go.sum @@ -596,8 +596,8 @@ k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 h1:SjGebBtkBqHFOli+05xYbK8YF1Dzk k8s.io/utils v0.0.0-20251002143259-bc988d571ff4/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= oras.land/oras-go/v2 v2.6.0 h1:X4ELRsiGkrbeox69+9tzTu492FMUu7zJQW6eJU+I2oc= oras.land/oras-go/v2 v2.6.0/go.mod h1:magiQDfG6H1O9APp+rOsvCPcW1GD2MM7vgnKY0Y+u1o= -sigs.k8s.io/controller-runtime v0.22.4 h1:GEjV7KV3TY8e+tJ2LCTxUTanW4z/FmNB7l327UfMq9A= -sigs.k8s.io/controller-runtime v0.22.4/go.mod h1:+QX1XUpTXN4mLoblf4tqr5CQcyHPAki2HLXqQMY6vh8= +sigs.k8s.io/controller-runtime v0.23.0 h1:Ubi7klJWiwEWqDY+odSVZiFA0aDSevOCXpa38yCSYu8= +sigs.k8s.io/controller-runtime v0.23.0/go.mod h1:DBOIr9NsprUqCZ1ZhsuJ0wAnQSIxY/C6VjZbmLgw0j0= sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5EXP7sU1kvOlxwZh5txg= sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg= sigs.k8s.io/kustomize/api v0.20.1 h1:iWP1Ydh3/lmldBnH/S5RXgT98vWYMaTUL1ADcr+Sv7I= From c808bdbcd36de8970791ade48347814f5da848e6 Mon Sep 17 00:00:00 2001 From: Matheus Pimenta Date: Tue, 27 Jan 2026 19:59:39 +0000 Subject: [PATCH 3/3] Disable priority queue to test if it's the cause Co-Authored-By: Claude Opus 4.5 --- internal/controller/helmrelease_manager.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/internal/controller/helmrelease_manager.go b/internal/controller/helmrelease_manager.go index cabe43112..d0c84432b 100644 --- a/internal/controller/helmrelease_manager.go +++ b/internal/controller/helmrelease_manager.go @@ -24,6 +24,7 @@ import ( sourcev1 "github.com/fluxcd/source-controller/api/v1" corev1 "k8s.io/api/core/v1" "k8s.io/client-go/util/workqueue" + "k8s.io/utils/ptr" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/builder" "sigs.k8s.io/controller-runtime/pkg/client" @@ -152,6 +153,9 @@ func (r *HelmReleaseReconciler) SetupWithManager(ctx context.Context, mgr ctrl.M ) } - return ctrlBuilder.WithOptions(controller.Options{RateLimiter: opts.RateLimiter}).Complete(r) + return ctrlBuilder.WithOptions(controller.Options{ + RateLimiter: opts.RateLimiter, + UsePriorityQueue: ptr.To(false), + }).Complete(r) }