chore: Upgrade controller runtime to 0.21.0 (#2479)

ruanxin · dependabot[bot] · c-pius · web-flow · commit 8c1a35ccaf73 · 2025-05-30T09:40:04.000+02:00
* chore(dependabot): bump sigs.k8s.io/controller-runtime 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> * remove requeue: false case in ctrl.Result --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Christoph Schwägerl <c.schwaegerl@sap.com>
diff --git a/go.mod b/go.mod
@@ -29,7 +29,7 @@ require (
 	golang.org/x/time v0.11.0
 	k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e
 	ocm.software/ocm v0.24.0
-	sigs.k8s.io/controller-runtime v0.20.4
+	sigs.k8s.io/controller-runtime v0.21.0
 	sigs.k8s.io/yaml v1.4.0
 )
 
diff --git a/go.sum b/go.sum
@@ -1291,8 +1291,8 @@ oras.land/oras-go v1.2.6 h1:z8cmxQXBU8yZ4mkytWqXfo6tZcamPwjsuxYU81xJ8Lk=
 oras.land/oras-go v1.2.6/go.mod h1:OVPc1PegSEe/K8YiLfosrlqlqTN9PUyFvOw5Y9gwrT8=
 oras.land/oras-go/v2 v2.5.0 h1:o8Me9kLY74Vp5uw07QXPiitjsw7qNXi8Twd+19Zf02c=
 oras.land/oras-go/v2 v2.5.0/go.mod h1:z4eisnLP530vwIOUOJeBIj0aGI0L1C3d53atvCBqZHg=
-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/gateway-api v1.3.0 h1:q6okN+/UKDATola4JY7zXzx40WO4VISk7i9DIfOvr9M=
 sigs.k8s.io/gateway-api v1.3.0/go.mod h1:d8NV8nJbaRbEKem+5IuxkL8gJGOZ+FJ+NvOIltV8gDk=
 sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
diff --git a/internal/controller/istiogatewaysecret/controller.go b/internal/controller/istiogatewaysecret/controller.go
@@ -45,14 +45,14 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
 		return ctrl.Result{}, fmt.Errorf("failed to get istio gateway root secret: %w", err)
 	}
 	if rootSecret == nil {
-		return ctrl.Result{Requeue: true, RequeueAfter: r.intervals.Error}, ErrSecretNotFound
+		return ctrl.Result{RequeueAfter: r.intervals.Error}, ErrSecretNotFound
 	}
 
 	err = r.handler.ManageGatewaySecret(ctx, rootSecret)
 	if err != nil {
-		return ctrl.Result{Requeue: true, RequeueAfter: r.intervals.Error},
+		return ctrl.Result{RequeueAfter: r.intervals.Error},
 			fmt.Errorf("failed to manage gateway secret: %w", err)
 	}
 
-	return ctrl.Result{Requeue: true, RequeueAfter: r.intervals.Success}, nil
+	return ctrl.Result{RequeueAfter: r.intervals.Success}, nil
 }
diff --git a/internal/controller/kyma/controller.go b/internal/controller/kyma/controller.go
@@ -98,7 +98,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
 			if err = r.deleteOrphanedCertificate(ctx, req.Name); err != nil {
 				return ctrl.Result{}, err
 			}
-			return ctrl.Result{Requeue: false}, nil
+			return ctrl.Result{}, nil
 		}
 		r.Metrics.RecordRequeueReason(metrics.KymaRetrieval, queue.UnexpectedRequeue)
 		return ctrl.Result{}, fmt.Errorf("KymaController: %w", err)
@@ -382,7 +382,7 @@ func (r *Reconciler) processKymaState(ctx context.Context, kyma *v1beta2.Kyma) (
 		return ctrl.Result{}, nil // no requeue of invalid state
 	}
 
-	return ctrl.Result{Requeue: false}, nil
+	return ctrl.Result{}, nil
 }
 
 func (r *Reconciler) handleInitialState(ctx context.Context, kyma *v1beta2.Kyma) (ctrl.Result, error) {
diff --git a/internal/controller/mandatorymodule/deletion_controller.go b/internal/controller/mandatorymodule/deletion_controller.go
@@ -56,7 +56,7 @@ func (r *DeletionReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
 		if util.IsNotFound(err) {
 			logger.V(log.DebugLevel).Info(fmt.Sprintf("ModuleTemplate %s not found, probably already deleted",
 				req.NamespacedName))
-			return ctrl.Result{Requeue: false}, nil
+			return ctrl.Result{}, nil
 		}
 		return ctrl.Result{}, fmt.Errorf("MandatoryModuleDeletionController: %w", err)
 	}
diff --git a/internal/controller/mandatorymodule/installation_controller.go b/internal/controller/mandatorymodule/installation_controller.go
@@ -53,7 +53,7 @@ func (r *InstallationReconciler) Reconcile(ctx context.Context, req ctrl.Request
 		if util.IsNotFound(err) {
 			logger.V(log.DebugLevel).Info(fmt.Sprintf("Kyma %s not found, probably already deleted",
 				req.NamespacedName))
-			return ctrl.Result{Requeue: false}, nil
+			return ctrl.Result{}, nil
 		}
 		return ctrl.Result{}, fmt.Errorf("MandatoryModuleController: %w", err)
 	}
diff --git a/internal/controller/watcher/controller.go b/internal/controller/watcher/controller.go
@@ -73,7 +73,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
 		if !util.IsNotFound(err) {
 			return ctrl.Result{}, fmt.Errorf("watcherController: %w", err)
 		}
-		return ctrl.Result{Requeue: false}, nil
+		return ctrl.Result{}, nil
 	}
 
 	if !watcher.DeletionTimestamp.IsZero() && watcher.Status.State != shared.StateDeleting {
@@ -118,7 +118,7 @@ func (r *Reconciler) stateHandling(ctx context.Context, watcher *v1beta2.Watcher
 		return ctrl.Result{}, nil // no requeue of invalid state
 	}
 
-	return ctrl.Result{Requeue: false}, nil
+	return ctrl.Result{}, nil
 }
 
 func (r *Reconciler) handleDeletingState(ctx context.Context, watcher *v1beta2.Watcher) (ctrl.Result, error) {

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ require (`
`29`	`29`	`golang.org/x/time v0.11.0`
`30`	`30`	`k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e`
`31`	`31`	`ocm.software/ocm v0.24.0`
`32`		`- sigs.k8s.io/controller-runtime v0.20.4`
	`32`	`+ sigs.k8s.io/controller-runtime v0.21.0`
`33`	`33`	`sigs.k8s.io/yaml v1.4.0`
`34`	`34`	`)`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -45,14 +45,14 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu`
`45`	`45`	`return ctrl.Result{}, fmt.Errorf("failed to get istio gateway root secret: %w", err)`
`46`	`46`	`}`
`47`	`47`	`if rootSecret == nil {`
`48`		`- return ctrl.Result{Requeue: true, RequeueAfter: r.intervals.Error}, ErrSecretNotFound`
	`48`	`+ return ctrl.Result{RequeueAfter: r.intervals.Error}, ErrSecretNotFound`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`err = r.handler.ManageGatewaySecret(ctx, rootSecret)`
`52`	`52`	`if err != nil {`
`53`		`- return ctrl.Result{Requeue: true, RequeueAfter: r.intervals.Error},`
	`53`	`+ return ctrl.Result{RequeueAfter: r.intervals.Error},`
`54`	`54`	`fmt.Errorf("failed to manage gateway secret: %w", err)`
`55`	`55`	`}`
`56`	`56`
`57`		`- return ctrl.Result{Requeue: true, RequeueAfter: r.intervals.Success}, nil`
	`57`	`+ return ctrl.Result{RequeueAfter: r.intervals.Success}, nil`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu`
`98`	`98`	`if err = r.deleteOrphanedCertificate(ctx, req.Name); err != nil {`
`99`	`99`	`return ctrl.Result{}, err`
`100`	`100`	`}`
`101`		`- return ctrl.Result{Requeue: false}, nil`
	`101`	`+ return ctrl.Result{}, nil`
`102`	`102`	`}`
`103`	`103`	`r.Metrics.RecordRequeueReason(metrics.KymaRetrieval, queue.UnexpectedRequeue)`
`104`	`104`	`return ctrl.Result{}, fmt.Errorf("KymaController: %w", err)`
`@@ -382,7 +382,7 @@ func (r Reconciler) processKymaState(ctx context.Context, kyma v1beta2.Kyma) (`
`382`	`382`	`return ctrl.Result{}, nil // no requeue of invalid state`
`383`	`383`	`}`
`384`	`384`
`385`		`- return ctrl.Result{Requeue: false}, nil`
	`385`	`+ return ctrl.Result{}, nil`
`386`	`386`	`}`
`387`	`387`
`388`	`388`	`func (r Reconciler) handleInitialState(ctx context.Context, kyma v1beta2.Kyma) (ctrl.Result, error) {`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ func (r *DeletionReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c`
`56`	`56`	`if util.IsNotFound(err) {`
`57`	`57`	`logger.V(log.DebugLevel).Info(fmt.Sprintf("ModuleTemplate %s not found, probably already deleted",`
`58`	`58`	`req.NamespacedName))`
`59`		`- return ctrl.Result{Requeue: false}, nil`
	`59`	`+ return ctrl.Result{}, nil`
`60`	`60`	`}`
`61`	`61`	`return ctrl.Result{}, fmt.Errorf("MandatoryModuleDeletionController: %w", err)`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ func (r *InstallationReconciler) Reconcile(ctx context.Context, req ctrl.Request`
`53`	`53`	`if util.IsNotFound(err) {`
`54`	`54`	`logger.V(log.DebugLevel).Info(fmt.Sprintf("Kyma %s not found, probably already deleted",`
`55`	`55`	`req.NamespacedName))`
`56`		`- return ctrl.Result{Requeue: false}, nil`
	`56`	`+ return ctrl.Result{}, nil`
`57`	`57`	`}`
`58`	`58`	`return ctrl.Result{}, fmt.Errorf("MandatoryModuleController: %w", err)`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu`
`73`	`73`	`if !util.IsNotFound(err) {`
`74`	`74`	`return ctrl.Result{}, fmt.Errorf("watcherController: %w", err)`
`75`	`75`	`}`
`76`		`- return ctrl.Result{Requeue: false}, nil`
	`76`	`+ return ctrl.Result{}, nil`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`if !watcher.DeletionTimestamp.IsZero() && watcher.Status.State != shared.StateDeleting {`
`@@ -118,7 +118,7 @@ func (r Reconciler) stateHandling(ctx context.Context, watcher v1beta2.Watcher`
`118`	`118`	`return ctrl.Result{}, nil // no requeue of invalid state`
`119`	`119`	`}`
`120`	`120`
`121`		`- return ctrl.Result{Requeue: false}, nil`
	`121`	`+ return ctrl.Result{}, nil`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`func (r Reconciler) handleDeletingState(ctx context.Context, watcher v1beta2.Watcher) (ctrl.Result, error) {`