Merge pull request #4789 from matrus2/finlizer_fix

🐛 (deploy-image/v1-alpha): remove superfluous addFinalizer error handling

Author: k8s-ci-robot

pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/controllers/controller.go

@@ -178,12 +178,7 @@ func (r *{{ .Resource.Kind }}Reconciler) Reconcile(ctx context.Context, req ctrl
 	// More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/finalizers
 	if !controllerutil.ContainsFinalizer({{ lower .Resource.Kind }}, {{ lower .Resource.Kind }}Finalizer) {
 		log.Info("Adding Finalizer for {{ .Resource.Kind }}")
-		if ok := controllerutil.AddFinalizer({{ lower .Resource.Kind }}, {{ lower .Resource.Kind }}Finalizer); !ok {
-			err = fmt.Errorf("finalizer for {{ .Resource.Kind }} was not added")
-			log.Error(err, "Failed to add finalizer for {{ .Resource.Kind }}")
-			return ctrl.Result{}, err
-		}
-
+		controllerutil.AddFinalizer({{ lower .Resource.Kind }}, {{ lower .Resource.Kind }}Finalizer)
 		if err = r.Update(ctx, {{ lower .Resource.Kind }}); err != nil {
 			log.Error(err, "Failed to update custom resource to add finalizer")
 			return ctrl.Result{}, err

testdata/project-v4-multigroup/internal/controller/example.com/busybox_controller.go

@@ -123,12 +123,7 @@ func (r *BusyboxReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 	// More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/finalizers
 	if !controllerutil.ContainsFinalizer(busybox, busyboxFinalizer) {
 		log.Info("Adding Finalizer for Busybox")
-		if ok := controllerutil.AddFinalizer(busybox, busyboxFinalizer); !ok {
-			err = fmt.Errorf("finalizer for Busybox was not added")
-			log.Error(err, "Failed to add finalizer for Busybox")
-			return ctrl.Result{}, err
-		}
-
+		controllerutil.AddFinalizer(busybox, busyboxFinalizer)
 		if err = r.Update(ctx, busybox); err != nil {
 			log.Error(err, "Failed to update custom resource to add finalizer")
 			return ctrl.Result{}, err

testdata/project-v4-multigroup/internal/controller/example.com/memcached_controller.go

@@ -123,12 +123,7 @@ func (r *MemcachedReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 	// More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/finalizers
 	if !controllerutil.ContainsFinalizer(memcached, memcachedFinalizer) {
 		log.Info("Adding Finalizer for Memcached")
-		if ok := controllerutil.AddFinalizer(memcached, memcachedFinalizer); !ok {
-			err = fmt.Errorf("finalizer for Memcached was not added")
-			log.Error(err, "Failed to add finalizer for Memcached")
-			return ctrl.Result{}, err
-		}
-
+		controllerutil.AddFinalizer(memcached, memcachedFinalizer)
 		if err = r.Update(ctx, memcached); err != nil {
 			log.Error(err, "Failed to update custom resource to add finalizer")
 			return ctrl.Result{}, err

testdata/project-v4-with-plugins/internal/controller/busybox_controller.go

@@ -123,12 +123,7 @@ func (r *BusyboxReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 	// More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/finalizers
 	if !controllerutil.ContainsFinalizer(busybox, busyboxFinalizer) {
 		log.Info("Adding Finalizer for Busybox")
-		if ok := controllerutil.AddFinalizer(busybox, busyboxFinalizer); !ok {
-			err = fmt.Errorf("finalizer for Busybox was not added")
-			log.Error(err, "Failed to add finalizer for Busybox")
-			return ctrl.Result{}, err
-		}
-
+		controllerutil.AddFinalizer(busybox, busyboxFinalizer)
 		if err = r.Update(ctx, busybox); err != nil {
 			log.Error(err, "Failed to update custom resource to add finalizer")
 			return ctrl.Result{}, err

testdata/project-v4-with-plugins/internal/controller/memcached_controller.go

@@ -123,12 +123,7 @@ func (r *MemcachedReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 	// More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/finalizers
 	if !controllerutil.ContainsFinalizer(memcached, memcachedFinalizer) {
 		log.Info("Adding Finalizer for Memcached")
-		if ok := controllerutil.AddFinalizer(memcached, memcachedFinalizer); !ok {
-			err = fmt.Errorf("finalizer for Memcached was not added")
-			log.Error(err, "Failed to add finalizer for Memcached")
-			return ctrl.Result{}, err
-		}
-
+		controllerutil.AddFinalizer(memcached, memcachedFinalizer)
 		if err = r.Update(ctx, memcached); err != nil {
 			log.Error(err, "Failed to update custom resource to add finalizer")
 			return ctrl.Result{}, err