feat: make discovery work

Author: zachsmith1

api/v1alpha1/dnszonediscovery_types.go

@@ -78,4 +78,3 @@ type DNSZoneDiscoveryList struct {
 func init() {
 	SchemeBuilder.Register(&DNSZoneDiscovery{}, &DNSZoneDiscoveryList{})
 }
-

cmd/discovery/main.go

@@ -0,0 +1,80 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+package main
+
+import (
+	"context"
+	"encoding/json"
+	"flag"
+	"fmt"
+	"os"
+	"time"
+
+	"go.miloapis.com/dns-operator/internal/discovery"
+)
+
+func main() {
+	domainFlag := flag.String("domain", "", "Zone/domain to discover (e.g. example.com)")
+	timeoutFlag := flag.Duration("timeout", 15*time.Second, "Timeout for DNS discovery")
+	flag.Parse()
+
+	fmt.Println("discovery CLI starting")
+	domain := *domainFlag
+	if domain == "" {
+		// Accept positional arg as fallback: cmd/discovery <domain>
+		if flag.NArg() > 0 {
+			domain = flag.Arg(0)
+		}
+	}
+	if domain == "" {
+		fmt.Fprintln(os.Stderr, "error: domain is required\nUsage: discovery -domain example.com [-timeout 10s]")
+		flag.PrintDefaults()
+		os.Exit(2)
+	}
+
+	fmt.Printf("target domain: %s\n", domain)
+	ctx, cancel := context.WithTimeout(context.Background(), *timeoutFlag)
+	defer cancel()
+
+	start := time.Now()
+	type result struct {
+		sets []interface{}
+		err  error
+	}
+	resCh := make(chan result, 1)
+	go func() {
+		rs, err := discovery.DiscoverZoneRecords(context.Background(), domain)
+		asAny := make([]interface{}, len(rs))
+		for i := range rs {
+			asAny[i] = rs[i]
+		}
+		resCh <- result{sets: asAny, err: err}
+	}()
+
+	var (
+		recordSetsAny []interface{}
+		err           error
+	)
+	select {
+	case r := <-resCh:
+		recordSetsAny, err = r.sets, r.err
+	case <-ctx.Done():
+		elapsed := time.Since(start)
+		fmt.Fprintf(os.Stderr, "discovery timed out for %q after %s\n", domain, elapsed)
+		os.Exit(1)
+	}
+	elapsed := time.Since(start)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "discovery failed for %q after %s: %v\n", domain, elapsed, err)
+		os.Exit(1)
+	}
+
+	fmt.Printf("discovery succeeded for %q in %s\n", domain, elapsed)
+	fmt.Printf("discovered record set count: %d\n", len(recordSetsAny))
+
+	enc := json.NewEncoder(os.Stdout)
+	enc.SetIndent("", "  ")
+	if err := enc.Encode(recordSetsAny); err != nil {
+		fmt.Fprintf(os.Stderr, "failed to encode results: %v\n", err)
+		os.Exit(1)
+	}
+}

discovery.yaml

@@ -0,0 +1,102 @@
+apiVersion: dns.networking.miloapis.com/v1alpha1
+kind: DNSZoneDiscovery
+metadata:
+  annotations:
+    kubectl.kubernetes.io/last-applied-configuration: |
+      {"apiVersion":"dns.networking.miloapis.com/v1alpha1","kind":"DNSZoneDiscovery","metadata":{"annotations":{},"labels":{"app.kubernetes.io/managed-by":"kustomize","app.kubernetes.io/name":"dns-operator"},"name":"www-example-com","namespace":"default"},"spec":{"dnsZoneRef":{"name":"example-com"}}}
+  creationTimestamp: "2025-11-18T01:56:04Z"
+  generation: 1
+  labels:
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/name: dns-operator
+  name: www-example-com
+  namespace: default
+  resourceVersion: "2310"
+  uid: 3585b686-a326-4c6b-88d2-abc699c18724
+spec:
+  dnsZoneRef:
+    name: example-com
+status:
+  conditions:
+  - lastTransitionTime: "2025-11-18T01:56:04Z"
+    message: discovery accepted
+    observedGeneration: 1
+    reason: Accepted
+    status: "True"
+    type: Accepted
+  - lastTransitionTime: "2025-11-18T01:56:04Z"
+    message: zone records discovered
+    observedGeneration: 1
+    reason: Discovered
+    status: "True"
+    type: Discovered
+  recordSets:
+  - recordType: MX
+    records:
+    - mx:
+        exchange: .
+        preference: 0
+      name: '@'
+      ttl: 27906
+  - recordType: A
+    records:
+    - a:
+        content: 23.192.228.84
+      name: '@'
+      ttl: 293
+    - a:
+        content: 23.220.75.245
+      name: '@'
+      ttl: 293
+    - a:
+        content: 23.215.0.138
+      name: '@'
+      ttl: 293
+    - a:
+        content: 23.192.228.80
+      name: '@'
+      ttl: 293
+    - a:
+        content: 23.215.0.136
+      name: '@'
+      ttl: 293
+    - a:
+        content: 23.220.75.232
+      name: '@'
+      ttl: 293
+  - recordType: AAAA
+    records:
+    - aaaa:
+        content: 2600:1406:5e00:6::17ce:bc12
+      name: '@'
+      ttl: 15
+    - aaaa:
+        content: 2600:1406:5e00:6::17ce:bc1b
+      name: '@'
+      ttl: 15
+    - aaaa:
+        content: 2600:1406:bc00:53::b81e:94ce
+      name: '@'
+      ttl: 15
+    - aaaa:
+        content: 2600:1408:ec00:36::1736:7f24
+      name: '@'
+      ttl: 15
+    - aaaa:
+        content: 2600:1406:bc00:53::b81e:94c8
+      name: '@'
+      ttl: 15
+    - aaaa:
+        content: 2600:1408:ec00:36::1736:7f31
+      name: '@'
+      ttl: 15
+  - recordType: TXT
+    records:
+    - name: '@'
+      ttl: 27495
+      txt:
+        content: v=spf1 -all
+    - name: '@'
+      ttl: 27495
+      txt:
+        content: _k2n1y4vw3qtb4skdx9e7dxt97qrmmq9

internal/controller/dnszonediscovery_controller.go

@@ -78,7 +78,7 @@ func (r *DNSZoneDiscoveryReplicator) Reconcile(ctx context.Context, req mcreconc
 	// Mark Accepted true if not already
 	if getCondStatus(dzd.Status.Conditions, CondAccepted) != metav1.ConditionTrue {
 		base := dzd.DeepCopy()
-		if setCond(&dzd.Status.Conditions, CondAccepted, ReasonAccepted, "discovery accepted", metav1.ConditionTrue, dzd.Generation) {
+		if setCond(&dzd.Status.Conditions, CondAccepted, ReasonAccepted, "Discovery Accepted", metav1.ConditionTrue, dzd.Generation) {
 			if err := upstreamCluster.GetClient().Status().Patch(ctx, &dzd, client.MergeFrom(base)); err != nil {
 				return ctrl.Result{}, err
 			}
@@ -97,7 +97,7 @@ func (r *DNSZoneDiscoveryReplicator) Reconcile(ctx context.Context, req mcreconc
 
 	base := dzd.DeepCopy()
 	dzd.Status.RecordSets = recordSets
-	_ = setCond(&dzd.Status.Conditions, CondDiscovered, ReasonDiscovered, "zone records discovered", metav1.ConditionTrue, dzd.Generation)
+	_ = setCond(&dzd.Status.Conditions, CondDiscovered, ReasonDiscovered, "Zone Records Discovered", metav1.ConditionTrue, dzd.Generation)
 	if err := upstreamCluster.GetClient().Status().Patch(ctx, &dzd, client.MergeFrom(base)); err != nil {
 		return ctrl.Result{}, err
 	}

internal/discovery/resolver.go

@@ -13,6 +13,7 @@ import (
 // DiscoverZoneRecords performs best-effort discovery of common RR types for the given domain
 // and returns RecordSets grouped by RecordType, with typed fields populated where available.
 func DiscoverZoneRecords(ctx context.Context, domain string) ([]dnsv1alpha1.DiscoveredRecordSet, error) {
+	fmt.Printf("starting discovery for domain=%q\n", domain)
 	// Exclude NS and SOA per requirements.
 	options := dnsx.DefaultOptions
 	qtypes := []uint16{
@@ -30,19 +31,29 @@ func DiscoverZoneRecords(ctx context.Context, domain string) ([]dnsv1alpha1.Disc
 	options.QuestionTypes = qtypes
 	options.QueryAll = true
 
+	fmt.Println("creating dnsx client")
 	client, err := dnsx.New(options)
 	if err != nil {
 		return nil, err
 	}
+	fmt.Println("querying multiple record types")
 	resp, err := client.QueryMultiple(domain)
-	if err != nil || resp == nil || resp.RawResp == nil {
+	if err != nil {
 		return nil, err
 	}
-	// print all records
-	fmt.Printf("All records: %+v\n", resp.RawResp)
+	if resp == nil {
+		return nil, fmt.Errorf("dnsx returned nil response")
+	}
+	// Print quick summary for debugging
+	fmt.Printf("resolver status=%s answers=%d types=%v\n", resp.StatusCode, len(resp.AllRecords), qtypes)
 
+	// Build RRs from textual records since QueryMultiple does not populate RawResp
 	typeToRRs := make(map[uint16][]dns.RR)
-	for _, rr := range resp.RawResp.Answer {
+	for _, rec := range resp.AllRecords {
+		rr, perr := dns.NewRR(rec)
+		if perr != nil || rr == nil {
+			continue
+		}
 		rt := rr.Header().Rrtype
 		typeToRRs[rt] = append(typeToRRs[rt], rr)
 	}

test/e2e/chainsaw-test.yaml

@@ -323,7 +323,7 @@ spec:
           metadata:
             name: example-com
           status:
-            recordCount: 2
+            recordCount: 3
 
   - name: Delete DNSZone and confirm accounting configmap is deleted
     try: