From c8de23b89938d9a76dcc067d0a8c0d5727dc8a3f Mon Sep 17 00:00:00 2001 From: Aslak Knutsen Date: Wed, 4 Sep 2024 23:50:20 +0200 Subject: [PATCH] fix: error compare --- controllers/routingctrl/delete_resources.go | 4 ++-- controllers/routingctrl/exported_svc_locator.go | 5 +++++ controllers/routingctrl/reconcile_resources.go | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/controllers/routingctrl/delete_resources.go b/controllers/routingctrl/delete_resources.go index b32414b..e9e14e1 100644 --- a/controllers/routingctrl/delete_resources.go +++ b/controllers/routingctrl/delete_resources.go @@ -32,12 +32,12 @@ func (r *Controller) removeUnusedRoutingResources(ctx context.Context, target *u func (r *Controller) handleResourceDeletion(ctx context.Context, sourceRes *unstructured.Unstructured) error { exportModes := r.extractExportModes(sourceRes) if len(exportModes) == 0 { - r.log.Info("No export modes found, skipping deletion logic", "sourceRes", sourceRes) + r.log.Info("no export modes found, skipping deletion logic", "sourceRes", sourceRes) return nil } - r.log.Info("Handling deletion of dependent resources", "sourceRes", sourceRes) + r.log.Info("handling deletion of dependent resources", "sourceRes", sourceRes) gvks := routingResourceGVKs(exportModes...) diff --git a/controllers/routingctrl/exported_svc_locator.go b/controllers/routingctrl/exported_svc_locator.go index 7403144..5c690a0 100644 --- a/controllers/routingctrl/exported_svc_locator.go +++ b/controllers/routingctrl/exported_svc_locator.go @@ -48,6 +48,11 @@ func (e *ExportedServiceNotFoundError) Error() string { return fmt.Sprintf("no exported services found for target %s/%s (%s)", e.target.GetNamespace(), e.target.GetName(), e.target.GetObjectKind().GroupVersionKind().String()) } +func (e *ExportedServiceNotFoundError) Is(target error) bool { + _, ok := target.(*ExportedServiceNotFoundError) + return ok +} + func isExportedServiceNotFoundError(err error) bool { return errors.Is(err, &ExportedServiceNotFoundError{}) } diff --git a/controllers/routingctrl/reconcile_resources.go b/controllers/routingctrl/reconcile_resources.go index 36a6c0c..c4b106f 100644 --- a/controllers/routingctrl/reconcile_resources.go +++ b/controllers/routingctrl/reconcile_resources.go @@ -27,7 +27,7 @@ func (r *Controller) createRoutingResources(ctx context.Context, target *unstruc return r.propagateHostsToWatchedCR(ctx, target, nil, nil) } - r.log.Info("Reconciling resources for target", "target", target) + r.log.Info("reconciling resources for target", "target", target) renderedSelectors, errLables := config.ResolveSelectors(r.component.ServiceSelector, target) if errLables != nil {