Merge pull request #879 from bryanv/bryanv/use-ignore-not-found-helper

🌱 Simplify with controller-runtime IgnoreNotFound() helper
vmware-tanzu · Feb 5, 2025 · 066eb82 · 066eb82
2 parents 7105531 + 6f87a47
commit 066eb82
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/controllers/infra/configmap/infra_configmap_controller.go b/controllers/infra/configmap/infra_configmap_controller.go
@@ -10,7 +10,6 @@ import (
 
 	"github.com/go-logr/logr"
 	corev1 "k8s.io/api/core/v1"
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/event"
@@ -130,10 +129,7 @@ func (r *Reconciler) reconcileWcpClusterConfig(ctx context.Context, req ctrl.Req
 
 	cm := &corev1.ConfigMap{}
 	if err := r.Get(ctx, req.NamespacedName, cm); err != nil {
-		if !apierrors.IsNotFound(err) {
-			return err
-		}
-		return nil
+		return client.IgnoreNotFound(err)
 	}
 
 	clusterConfig, err := ParseWcpClusterConfig(cm.Data)

diff --git a/controllers/virtualmachine/volume/volume_controller.go b/controllers/virtualmachine/volume/volume_controller.go
@@ -218,10 +218,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, request ctrl.Request) (_ ctr
 
 	vm := &vmopv1.VirtualMachine{}
 	if err := r.Get(ctx, request.NamespacedName, vm); err != nil {
-		if apierrors.IsNotFound(err) {
-			return reconcile.Result{}, nil
-		}
-		return reconcile.Result{}, err
+		return ctrl.Result{}, client.IgnoreNotFound(err)
 	}
 
 	volCtx := &pkgctx.VolumeContext{