webhosting-operator: drop special handling for conflict errors

Rely on the usual exponential backoff and ignore the noisy logs.

Author: timebertt

webhosting-operator/pkg/controllers/webhosting/common.go

@@ -482,7 +482,7 @@ func (r *WebsiteReconciler) SetupWithManager(mgr manager.Manager, enableSharding
 	var (
 		// trigger on spec change and annotation changes (manual trigger for testing purposes)
 		websitePredicate = predicate.Or(predicate.GenerationChangedPredicate{}, predicate.AnnotationChangedPredicate{})
-		reconciler       = SilenceConflicts(reconcile.AsReconciler[*webhostingv1alpha1.Website](r.Client, r))
+		reconciler       = reconcile.AsReconciler[*webhostingv1alpha1.Website](r.Client, r)
 	)
 
 	if enableSharding {

webhosting-operator/pkg/controllers/webhosting/website_controller.go

@@ -124,12 +124,12 @@ var _ = BeforeEach(func(ctx SpecContext) {
 	By("Set up test ControllerRing")
 	controllerRing = &shardingv1alpha1.ControllerRing{ObjectMeta: metav1.ObjectMeta{Name: webhostingv1alpha1.WebhostingOperatorName}}
 
-	By("Scaling checksum-controller")
+	By("Scaling webhosting-operator")
 	controllerDeployment = &appsv1.Deployment{ObjectMeta: metav1.ObjectMeta{Name: webhostingv1alpha1.WebhostingOperatorName, Namespace: webhostingv1alpha1.NamespaceSystem}}
 	scaleController(ctx, 3)
 
 	DeferCleanup(func(ctx SpecContext) {
-		By("Scaling checksum-controller")
+		By("Scaling webhosting-operator")
 		scaleController(ctx, 3)
 	}, NodeTimeout(ShortTimeout))