Bump sigs.k8s.io/controller-runtime from 0.20.4 to 0.21.0 (#1679)

* Bump sigs.k8s.io/controller-runtime from 0.20.4 to 0.21.0

Bumps [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime) from 0.20.4 to 0.21.0.
- [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases)
- [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md)
- [Commits](kubernetes-sigs/controller-runtime@v0.20.4...v0.21.0)

---
updated-dependencies:
- dependency-name: sigs.k8s.io/controller-runtime
  dependency-version: 0.21.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* fix: resolved the result.Requeue and removed the deprecated reference

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Rohith Jayawardene <gambol99@gmail.com>

Author: dependabot[bot]

go.mod

@@ -54,7 +54,7 @@ require (
 	k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff
 	k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
 	mvdan.cc/sh/v3 v3.10.0
-	sigs.k8s.io/controller-runtime v0.20.4
+	sigs.k8s.io/controller-runtime v0.21.0
 	sigs.k8s.io/controller-tools v0.18.0
 	sigs.k8s.io/yaml v1.5.0
 )

go.sum

@@ -2488,8 +2488,8 @@ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8
 rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
-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/controller-tools v0.18.0 h1:rGxGZCZTV2wJreeRgqVoWab/mfcumTMmSwKzoM9xrsE=
 sigs.k8s.io/controller-tools v0.18.0/go.mod h1:gLKoiGBriyNh+x1rWtUQnakUYEujErjXs9pf+x/8n1U=
 sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=

pkg/controller/ensure.go

@@ -66,7 +66,7 @@ func RequeueUnless(result reconcile.Result, err error, duration time.Duration) (
 	if err != nil {
 		return reconcile.Result{}, err
 	}
-	if result.Requeue || result.RequeueAfter > 0 {
+	if result.RequeueAfter > 0 {
 		return result, nil
 	}
 
@@ -111,7 +111,7 @@ func (e *EnsureRunner) Run(ctx context.Context, cc client.Client, resource Objec
 
 			return reconcile.Result{}, rerr
 		}
-		if result.Requeue || result.RequeueAfter > 0 {
+		if result.RequeueAfter > 0 {
 			return result, nil
 		}
 	}

pkg/controller/ensure_test.go

@@ -70,6 +70,7 @@ var _ = Describe("EnsureRunner", func() {
 			var originalTime metav1.Time
 			BeforeEach(func() {
 				originalTime = metav1.Time{Time: time.Now().Add(-time.Hour).Truncate(time.Second)}
+
 				configuration.Status = terraformv1alpha1.ConfigurationStatus{
 					CommonStatus: corev1alpha1.CommonStatus{
 						LastReconcile: &corev1alpha1.LastReconcileStatus{
@@ -152,11 +153,11 @@ var _ = Describe("EnsureRunner", func() {
 					result, err := ensure.Run(ctx, cc, configuration, []EnsureFunc{
 						func(ctx context.Context) (reconcile.Result, error) {
 							configuration.Spec.Module = "m1"
-							return reconcile.Result{Requeue: true}, nil
+							return reconcile.Result{RequeueAfter: 5 * time.Second}, nil
 						},
 					})
 					Expect(err).NotTo(HaveOccurred())
-					Expect(result).To(Equal(reconcile.Result{Requeue: true}))
+					Expect(result.RequeueAfter).To(Equal(5 * time.Second))
 
 					Expect(configuration.Status.CommonStatus.LastReconcile).NotTo(BeNil())
 					Expect(configuration.Status.CommonStatus.LastReconcile.Time).NotTo(Equal(originalTime))
@@ -170,11 +171,11 @@ var _ = Describe("EnsureRunner", func() {
 				It("does not update status", func() {
 					result, err := ensure.Run(ctx, cc, configuration, []EnsureFunc{
 						func(ctx context.Context) (reconcile.Result, error) {
-							return reconcile.Result{Requeue: true}, nil
+							return reconcile.Result{RequeueAfter: 5 * time.Second}, nil
 						},
 					})
 					Expect(err).NotTo(HaveOccurred())
-					Expect(result).To(Equal(reconcile.Result{Requeue: true}))
+					Expect(result.RequeueAfter).To(Equal(5 * time.Second))
 
 					Expect(configuration.Status.CommonStatus.LastReconcile).NotTo(BeNil())
 					Expect(configuration.Status.CommonStatus.LastReconcile.Time).To(Equal(originalTime))

test/controller.go

@@ -38,7 +38,7 @@ func Roll(ctx context.Context, ctrl reconcile.Reconciler, o client.Object, _ int
 		switch {
 		case err != nil:
 			return result, i, err
-		case result.Requeue, result.RequeueAfter > 0:
+		case result.RequeueAfter > 0:
 		default:
 			return result, i, nil
 		}

vendor/modules.txt

@@ -2773,8 +2773,8 @@ mvdan.cc/sh/v3/syntax/typedjson
 # mvdan.cc/unparam v0.0.0-20240528143540-8a5130ca722f
 ## explicit; go 1.21
 mvdan.cc/unparam/check
-# sigs.k8s.io/controller-runtime v0.20.4
-## explicit; go 1.23.0
+# sigs.k8s.io/controller-runtime v0.21.0
+## explicit; go 1.24.0
 sigs.k8s.io/controller-runtime
 sigs.k8s.io/controller-runtime/pkg/builder
 sigs.k8s.io/controller-runtime/pkg/cache