fix(kuma-cp) retry to resolve the service name by splitting it

Signed-off-by: Nikolay Nikolaev <nikolay.nikolaev@konghq.com>

pkg/dns-server/resolver/server.go

@@ -122,6 +122,7 @@ func (d *SimpleDNSResolver) SyncServices(services map[string]bool) (errs error)
 				errs = multierr.Append(errs, errors.Wrapf(err, "unable to allocate an ip for service %s", service))
 			} else {
 				d.viplist[service] = ip
+				simpleDNSLog.Info("Adding ", "service", service, "ip", ip)
 			}
 		}
 	}
@@ -212,7 +213,7 @@ func (d *SimpleDNSResolver) domainFromName(name string) (string, error) {
 
 func (d *SimpleDNSResolver) serviceFromName(name string) (string, error) {
 	split := dns.SplitDomainName(name)
-	if len(split) < 2 {
+	if len(split) < 1 {
 		return "", errors.Errorf("wrong DNS name: %s", name)
 	}
 

pkg/xds/server/components.go

@@ -2,9 +2,10 @@ package server
 
 import (
 	"context"
-	config_core "github.com/Kong/kuma/pkg/config/core"
 	"time"
 
+	config_core "github.com/Kong/kuma/pkg/config/core"
+
 	"github.com/Kong/kuma/pkg/xds/ingress"
 
 	envoy_xds "github.com/envoyproxy/go-control-plane/pkg/server/v2"

pkg/xds/topology/vip_outbounds.go

@@ -1,6 +1,8 @@
 package topology
 
 import (
+	"strings"
+
 	"github.com/pkg/errors"
 	"go.uber.org/multierr"
 
@@ -24,7 +26,12 @@ func PatchDataplaneWithVIPOutbounds(dataplane *mesh_core.DataplaneResource,
 
 			vip, err := resolver.ForwardLookup(inService)
 			if err != nil {
-				errs = multierr.Append(errs, errors.Wrapf(err, "unable to resolve %s", inService))
+				// try to get the first part of the FQDN service and look it up
+				split := strings.Split(inService, ".")
+				vip, err = resolver.ForwardLookup(split[0])
+				if err != nil {
+					errs = multierr.Append(errs, errors.Wrapf(err, "unable to resolve %s", inService))
+				}
 			}
 			serviceVIPMap[inService] = vip
 		}