integration tests for DNS Failover groups

Signed-off-by: Phil Brookes <pbrookes@redhat.com>

Signed-off-by: Phil Brookes <pbrookes@redhat.com>

rh-pre-commit.version: 2.3.2
rh-pre-commit.check-secrets: ENABLED

Author: philbrookes

config/coredns/Corefile

@@ -1,3 +1,12 @@
+kuadrant-active-groups.k.example.com {
+    debug
+    errors
+    log
+    rewrite stop {
+      name kuadrant-active-groups.k.example.com kuadrant-active-groups-coredns.pb.hcpapps.net
+    }
+    forward . /etc/resolv.conf
+}
 k.example.com {
     debug
     errors

config/local-setup/dns-provider/coredns/kustomization.yaml

@@ -5,6 +5,7 @@ generatorOptions:
   labels:
     app.kubernetes.io/part-of: dns-operator
     app.kubernetes.io/managed-by: kustomize
+    kuadrant.io/default-provider: "true"
 
 secretGenerator:
   - name: dns-provider-credentials

config/local-setup/dnsrecords/delegating/coredns/loadbalanced/dnsrecord-loadbalanced-coredns-cluster1.yaml

@@ -3,7 +3,7 @@ kind: DNSRecord
 metadata:
   name: dnsrecord-loadbalanced-coredns-cluster1
 spec:
-  rootHost: loadbalanced.k.example.com
+  rootHost: k.example.com
   endpoints:
     - dnsName: loadbalanced.k.example.com
       recordTTL: 300

config/local-setup/dnsrecords/delegating/coredns/loadbalanced/dnsrecord-loadbalanced-coredns-cluster2.yaml

@@ -3,7 +3,7 @@ kind: DNSRecord
 metadata:
   name: dnsrecord-loadbalanced-coredns-cluster2
 spec:
-  rootHost: loadbalanced.k.example.com
+  rootHost: k.example.com
   endpoints:
     - dnsName: loadbalanced.k.example.com
       recordTTL: 300

config/local-setup/dnsrecords/delegating/coredns/loadbalanced/dnsrecord-loadbalanced-coredns-cluster3.yaml

@@ -3,7 +3,7 @@ kind: DNSRecord
 metadata:
   name: dnsrecord-loadbalanced-coredns-cluster3
 spec:
-  rootHost: loadbalanced.k.example.com
+  rootHost: k.example.com
   endpoints:
     - dnsName: loadbalanced.k.example.com
       recordTTL: 300

coredns/examples/Corefile

@@ -1,3 +1,12 @@
+kuadrant-active-groups.k.example.com {
+    debug
+    errors
+    log
+    rewrite stop {
+      name kuadrant-active-groups.k.example.com kuadrant-active-groups-coredns.pb.hcpapps.net
+    }
+    forward . /etc/resolv.conf
+}
 k.example.com {
    debug
    errors

internal/controller/dnsrecord_controller.go

@@ -237,7 +237,9 @@ func (r *DNSRecordReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 		ctx, logger = r.setLogger(ctx, baseLogger, dnsRecord)
 	}
 
-	dnsRecord.SetStatusGroup(r.Group)
+	if !dnsRecord.GetDNSRecord().IsAuthoritativeRecord() && r.Group != "" {
+		dnsRecord.SetStatusGroup(r.Group)
+	}
 
 	if dnsRecord.IsDelegating() {
 		// ReadyForDelegation can be set to true once:
@@ -262,10 +264,7 @@ func (r *DNSRecordReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 	if !dnsRecord.GetDNSRecord().IsAuthoritativeRecord() && r.Group != "" {
 		var activeGroups types.Groups
 		activeGroups = r.getActiveGroups(ctx, r.Client, dnsRecord)
-
-		dnsRecord.SetStatusGroup(r.Group)
 		dnsRecord.SetStatusActiveGroups(activeGroups)
-
 		dnsRecord = newGroupAdapter(dnsRecord, activeGroups)
 	}
 

internal/controller/dnsrecord_groups.go

@@ -18,6 +18,7 @@ import (
 	externaldnsendpoint "sigs.k8s.io/external-dns/endpoint"
 	"sigs.k8s.io/external-dns/plan"
 
+	"github.com/go-logr/logr"
 	"github.com/kuadrant/dns-operator/api/v1alpha1"
 	"github.com/kuadrant/dns-operator/internal/external-dns/registry"
 	externaldnsregistry "github.com/kuadrant/dns-operator/internal/external-dns/registry"
@@ -31,34 +32,47 @@ const (
 
 // TXTResolver is an interface for resolving TXT DNS records
 type TXTResolver interface {
-	LookupTXT(host string, nameservers []string) ([]string, error)
+	LookupTXT(ctx context.Context, host string, nameservers []string) ([]string, error)
 }
 
 // DefaultTXTResolver is the default implementation that uses net.LookupTXT
 type DefaultTXTResolver struct{}
 
-func (d *DefaultTXTResolver) LookupTXT(host string, nameservers []string) ([]string, error) {
+func (d *DefaultTXTResolver) LookupTXT(ctx context.Context, host string, nameservers []string) ([]string, error) {
+	logger, err := logr.FromContext(ctx)
+	if err != nil {
+		return []string{}, nil
+	}
+	logger.Info("looking up txt record", "host", host, "nameservers", nameservers)
 	// If nameservers are provided, try each one until we get an answer
 	if len(nameservers) > 0 {
 		for _, ns := range nameservers {
+			// Parse the nameserver to handle cases where port is already specified
+			nsAddr := ns
+			if _, _, err := net.SplitHostPort(ns); err != nil {
+				// No port specified, add default port 53
+				nsAddr = net.JoinHostPort(ns, "53")
+			}
+			logger.V(1).Info("using nameserver", "nameserver", ns, "resolved", nsAddr)
+
 			resolver := &net.Resolver{
 				PreferGo: true,
 				Dial: func(ctx context.Context, network, address string) (net.Conn, error) {
 					dialer := net.Dialer{
-						Timeout: time.Second * 1,
+						Timeout: time.Second * 3,
 					}
-					// Use the nameserver with port 53
-					return dialer.DialContext(ctx, "udp", net.JoinHostPort(ns, "53"))
+					// Always use our specified nameserver, ignoring the address parameter
+					return dialer.DialContext(ctx, network, nsAddr)
 				},
 			}
 
-			ctx, cancel := context.WithTimeout(context.Background(), time.Second*1)
 			records, err := resolver.LookupTXT(ctx, host)
-			cancel()
 
 			if err == nil && len(records) > 0 {
+				logger.V(1).Info("successfully resolved txt record", "nameserver", nsAddr, "records", records)
 				return records, nil
 			}
+			logger.V(1).Info("failed to resolve txt record", "nameserver", nsAddr, "error", err)
 		}
 	}
 
@@ -112,16 +126,16 @@ func (r *BaseDNSRecordReconciler) getActiveGroups(ctx context.Context, c client.
 	activeGroupsHost := activeGroupsTXTRecordName + "." + dnsRecord.GetZoneDomainName()
 
 	nameservers := r.getNameserversFromProvider(ctx, c, dnsRecord)
-	values, err := r.TXTResolver.LookupTXT(activeGroupsHost, nameservers)
+	values, err := r.TXTResolver.LookupTXT(ctx, activeGroupsHost, nameservers)
 	if err != nil {
 		logger.Error(err, "error looking up active groups")
 		return activeGroups
 	}
 	// found an answer, format it and return
 	if len(values) > 0 {
 		activeGroupsStr := strings.Join(values, "")
-		pairs := strings.Split(activeGroupsStr, ";")
-		for _, pairStr := range pairs {
+		pairs := strings.SplitSeq(activeGroupsStr, ";")
+		for pairStr := range pairs {
 			sections := strings.Split(pairStr, "=")
 			if sections[0] == "groups" {
 				for g := range strings.SplitSeq(sections[1], "&&") {