From 16297a8ce6651dc4d1ade24ec6be364651cf1eb2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 10 Jun 2025 14:07:41 +0000 Subject: [PATCH 1/2] fix(deps): update module sigs.k8s.io/controller-runtime to v0.21.0 --- go.mod | 4 ++-- go.sum | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index ffdcfda..2da1b47 100644 --- a/go.mod +++ b/go.mod @@ -37,7 +37,7 @@ require ( k8s.io/apimachinery v0.33.1 k8s.io/client-go v0.33.1 k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 - sigs.k8s.io/controller-runtime v0.20.4 + sigs.k8s.io/controller-runtime v0.21.0 ) require ( @@ -121,7 +121,7 @@ require ( gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/apiextensions-apiserver v0.32.1 // indirect + k8s.io/apiextensions-apiserver v0.33.0 // indirect k8s.io/klog/v2 v2.130.1 // indirect k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect diff --git a/go.sum b/go.sum index 240543e..9532668 100644 --- a/go.sum +++ b/go.sum @@ -19,6 +19,8 @@ github.com/antlr4-go/antlr/v4 v4.13.1/go.mod h1:GKmUxMtwp6ZgGwZSva4eWPC5mS6vUAmO github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM= +github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/cenkalti/backoff/v5 v5.0.2 h1:rIfFVxEf1QsI7E1ZHfp/B4DF/6QBAUhmgkxc0H7Zss8= @@ -453,8 +455,8 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= k8s.io/api v0.33.1 h1:tA6Cf3bHnLIrUK4IqEgb2v++/GYUtqiu9sRVk3iBXyw= k8s.io/api v0.33.1/go.mod h1:87esjTn9DRSRTD4fWMXamiXxJhpOIREjWOSjsW1kEHw= -k8s.io/apiextensions-apiserver v0.32.1 h1:hjkALhRUeCariC8DiVmb5jj0VjIc1N0DREP32+6UXZw= -k8s.io/apiextensions-apiserver v0.32.1/go.mod h1:sxWIGuGiYov7Io1fAS2X06NjMIk5CbRHc2StSmbaQto= +k8s.io/apiextensions-apiserver v0.33.0 h1:d2qpYL7Mngbsc1taA4IjJPRJ9ilnsXIrndH+r9IimOs= +k8s.io/apiextensions-apiserver v0.33.0/go.mod h1:VeJ8u9dEEN+tbETo+lFkwaaZPg6uFKLGj5vyNEwwSzc= k8s.io/apimachinery v0.33.1 h1:mzqXWV8tW9Rw4VeW9rEkqvnxj59k1ezDUl20tFK/oM4= k8s.io/apimachinery v0.33.1/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM= k8s.io/client-go v0.33.1 h1:ZZV/Ks2g92cyxWkRRnfUDsnhNn28eFpt26aGc8KbXF4= @@ -473,8 +475,8 @@ modernc.org/memory v1.10.0 h1:fzumd51yQ1DxcOxSO+S6X7+QTuVU+n8/Aj7swYjFfC4= modernc.org/memory v1.10.0/go.mod h1:/JP4VbVC+K5sU2wZi9bHoq2MAkCnrt2r98UGeSK7Mjw= modernc.org/sqlite v1.37.0 h1:s1TMe7T3Q3ovQiK2Ouz4Jwh7dw4ZDqbebSDTlSJdfjI= modernc.org/sqlite v1.37.0/go.mod h1:5YiWv+YviqGMuGw4V+PNplcyaJ5v+vQd7TQOgkACoJM= -sigs.k8s.io/controller-runtime v0.20.4 h1:X3c+Odnxz+iPTRobG4tp092+CvBU9UK0t/bRf+n0DGU= -sigs.k8s.io/controller-runtime v0.20.4/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY= +sigs.k8s.io/controller-runtime v0.21.0 h1:CYfjpEuicjUecRk+KAeyYh+ouUBn4llGyDYytIGcJS8= +sigs.k8s.io/controller-runtime v0.21.0/go.mod h1:OSg14+F65eWqIu4DceX7k/+QRAbTTvxeQSNSOQpukWM= sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8= sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo= sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY= From 573899294b735611c77a860438c2255dce69d398 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20Echterh=C3=B6lter?= Date: Sat, 14 Jun 2025 14:39:53 +0200 Subject: [PATCH 2/2] chore: fix lint warnings --- controller/lifecycle/conditions.go | 4 ++-- controller/lifecycle/lifecycle.go | 9 +++------ controller/lifecycle/lifecycle_test.go | 2 -- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/controller/lifecycle/conditions.go b/controller/lifecycle/conditions.go index 9f0c66b..dce050a 100644 --- a/controller/lifecycle/conditions.go +++ b/controller/lifecycle/conditions.go @@ -98,12 +98,12 @@ func setSubroutineCondition(conditions *[]metav1.Condition, subroutine Subroutin conditionName, conditionMessage := getConditionNameAndMessage(subroutine, isFinalize) // processing complete - if subroutineErr == nil && !subroutineResult.Requeue && subroutineResult.RequeueAfter == 0 { + if subroutineErr == nil && subroutineResult.RequeueAfter == 0 { return meta.SetStatusCondition(conditions, metav1.Condition{Type: conditionName, Status: metav1.ConditionTrue, Message: fmt.Sprintf(subroutineMessageCompleteFormatString, conditionMessage), Reason: reasonComplete}) } // processing is still processing - if subroutineErr == nil && (subroutineResult.RequeueAfter > 0 || subroutineResult.Requeue) { + if subroutineErr == nil && subroutineResult.RequeueAfter > 0 { return meta.SetStatusCondition(conditions, metav1.Condition{Type: conditionName, Status: metav1.ConditionUnknown, Message: fmt.Sprintf(subroutineMessageProcessingFormatString, conditionMessage), Reason: reasonProcessing}) } diff --git a/controller/lifecycle/lifecycle.go b/controller/lifecycle/lifecycle.go index a9ef681..c5f8628 100644 --- a/controller/lifecycle/lifecycle.go +++ b/controller/lifecycle/lifecycle.go @@ -163,22 +163,19 @@ func (l *LifecycleManager) Reconcile(ctx context.Context, req ctrl.Request, inst } return subResult, err } - if subResult.Requeue { - result.Requeue = subResult.Requeue - } if subResult.RequeueAfter > 0 { if subResult.RequeueAfter < result.RequeueAfter || result.RequeueAfter == 0 { result.RequeueAfter = subResult.RequeueAfter } } if l.manageConditions { - if !subResult.Requeue && subResult.RequeueAfter == 0 { + if subResult.RequeueAfter == 0 { setSubroutineCondition(&conditions, subroutine, subResult, err, inDeletion, log) } } } - if !result.Requeue && result.RequeueAfter == 0 { + if result.RequeueAfter == 0 { // Reconciliation was successful l.markResourceAsFinal(instance, log, conditions, v1.ConditionTrue) } else { @@ -399,7 +396,7 @@ func (l *LifecycleManager) removeFinalizerIfNeeded(ctx context.Context, instance return nil } - if !result.Requeue && result.RequeueAfter == 0 { + if result.RequeueAfter == 0 { update := false for _, f := range subroutine.Finalizers() { needsUpdate := controllerutil.RemoveFinalizer(instance, f) diff --git a/controller/lifecycle/lifecycle_test.go b/controller/lifecycle/lifecycle_test.go index 81ca75d..ae334b2 100644 --- a/controller/lifecycle/lifecycle_test.go +++ b/controller/lifecycle/lifecycle_test.go @@ -143,7 +143,6 @@ func TestLifecycle(t *testing.T) { assert.NoError(t, err) assert.Equal(t, 1, len(instance.Finalizers)) - assert.True(t, res.Requeue) assert.Equal(t, time.Duration(0), res.RequeueAfter) }) @@ -174,7 +173,6 @@ func TestLifecycle(t *testing.T) { assert.NoError(t, err) assert.Equal(t, 1, len(instance.Finalizers)) - assert.False(t, res.Requeue) assert.Equal(t, 2*time.Second, res.RequeueAfter) })