From 27b984e20da116bafe60bde1da4d60c39986e675 Mon Sep 17 00:00:00 2001 From: Aslak Knutsen Date: Wed, 4 Sep 2024 23:15:45 +0200 Subject: [PATCH] lint --- controllers/routingctrl/reconcile_resources.go | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/controllers/routingctrl/reconcile_resources.go b/controllers/routingctrl/reconcile_resources.go index 651a20d..36a6c0c 100644 --- a/controllers/routingctrl/reconcile_resources.go +++ b/controllers/routingctrl/reconcile_resources.go @@ -50,16 +50,20 @@ func (r *Controller) createRoutingResources(ctx context.Context, target *unstruc return fmt.Errorf("could not get domain: %w", errDomain) } - targetPublicHosts := []string{} - targetExternalHosts := []string{} var errSvcExport []error + var targetPublicHosts []string + + var targetExternalHosts []string + for i := range exportedServices { servicePublicHosts, serviceExternalHosts, errExport := r.exportService(ctx, target, &exportedServices[i], domain) if errExport != nil { errSvcExport = append(errSvcExport, errExport) + continue } + targetPublicHosts = append(targetPublicHosts, servicePublicHosts...) targetExternalHosts = append(targetExternalHosts, serviceExternalHosts...) } @@ -71,12 +75,11 @@ func (r *Controller) createRoutingResources(ctx context.Context, target *unstruc return r.propagateHostsToWatchedCR(ctx, target, targetPublicHosts, targetExternalHosts) } -func (r *Controller) exportService(ctx context.Context, target *unstructured.Unstructured, exportedSvc *corev1.Service, domain string) ([]string, []string, error) { +//nolint:nonamedreturns //reason make up your mind, nonamedreturns vs gocritic +func (r *Controller) exportService(ctx context.Context, target *unstructured.Unstructured, + exportedSvc *corev1.Service, domain string) (publicHosts, externalHosts []string, err error) { exportModes := r.extractExportModes(target) - externalHosts := []string{} - publicHosts := []string{} - // To establish ownership for watched component ownershipLabels := append(labels.AsOwner(target), labels.AppManagedBy("odh-routing-controller"))