From 9fbfff0c059debab0c9c6044c360af07c8cd4382 Mon Sep 17 00:00:00 2001 From: Tyler Gillson Date: Thu, 16 Nov 2023 14:56:42 -0700 Subject: [PATCH] refactor: standardize get CR in Reconcile Signed-off-by: Tyler Gillson --- internal/controller/validationresult_controller.go | 9 +++++++-- internal/controller/validatorconfig_controller.go | 4 +++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/internal/controller/validationresult_controller.go b/internal/controller/validationresult_controller.go index e087c381..56152e10 100644 --- a/internal/controller/validationresult_controller.go +++ b/internal/controller/validationresult_controller.go @@ -22,6 +22,7 @@ import ( "github.com/go-logr/logr" corev1 "k8s.io/api/core/v1" + apierrs "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" ctrl "sigs.k8s.io/controller-runtime" @@ -60,7 +61,9 @@ func (r *ValidationResultReconciler) Reconcile(ctx context.Context, req ctrl.Req vc := &v1alpha1.ValidatorConfig{} vcKey := types.NamespacedName{Namespace: r.Namespace, Name: constants.ValidatorConfig} if err := r.Get(ctx, vcKey, vc); err != nil { - r.Log.Error(err, "failed to fetch ValidatorConfig", "key", vcKey) + if !apierrs.IsNotFound(err) { + r.Log.Error(err, "failed to fetch ValidatorConfig", "key", req) + } return ctrl.Result{}, client.IgnoreNotFound(err) } @@ -68,7 +71,9 @@ func (r *ValidationResultReconciler) Reconcile(ctx context.Context, req ctrl.Req vrKey = req.NamespacedName if err := r.Get(ctx, req.NamespacedName, vr); err != nil { - r.Log.Error(err, "failed to fetch ValidationResult", "key", req) + if !apierrs.IsNotFound(err) { + r.Log.Error(err, "failed to fetch ValidationResult", "key", req) + } return ctrl.Result{}, client.IgnoreNotFound(err) } diff --git a/internal/controller/validatorconfig_controller.go b/internal/controller/validatorconfig_controller.go index b33cc89a..b3f60e41 100644 --- a/internal/controller/validatorconfig_controller.go +++ b/internal/controller/validatorconfig_controller.go @@ -64,7 +64,9 @@ func (r *ValidatorConfigReconciler) Reconcile(ctx context.Context, req ctrl.Requ vc := &v1alpha1.ValidatorConfig{} if err := r.Get(ctx, req.NamespacedName, vc); err != nil { - r.Log.Error(err, "failed to fetch ValidatorConfig", "key", req) + if !apierrs.IsNotFound(err) { + r.Log.Error(err, "failed to fetch ValidatorConfig", "key", req) + } return ctrl.Result{}, client.IgnoreNotFound(err) }