chore: refactor ip change logic

Author: rxbn

api/v1/dnsrecord_types.go

@@ -76,6 +76,11 @@ type DNSRecordStatus struct {
 	RecordID string `json:"recordID,omitempty"`
 }
 
+const (
+	// IPRefIndexKey is the key used for indexing DNSRecord objects by their IPRef.
+	IPRefIndexKey string = ".spec.ipRef.name"
+)
+
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
 

cmd/main.go

@@ -152,7 +152,7 @@ func main() {
 		Client: mgr.GetClient(),
 		Scheme: mgr.GetScheme(),
 		Cf:     &cf,
-	}).SetupWithManager(mgr); err != nil {
+	}).SetupWithManager(ctx, mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "DNSRecord")
 		os.Exit(1)
 	}

internal/controller/dnsrecord_controller.go

@@ -33,6 +33,8 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
+	"sigs.k8s.io/controller-runtime/pkg/handler"
+	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
 	"github.com/cloudflare/cloudflare-go"
 	cloudflareoperatoriov1 "github.com/containeroo/cloudflare-operator/api/v1"
@@ -48,9 +50,18 @@ type DNSRecordReconciler struct {
 }
 
 // SetupWithManager sets up the controller with the Manager.
-func (r *DNSRecordReconciler) SetupWithManager(mgr ctrl.Manager) error {
+func (r *DNSRecordReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager) error {
+	if err := mgr.GetFieldIndexer().IndexField(ctx, &cloudflareoperatoriov1.DNSRecord{}, cloudflareoperatoriov1.IPRefIndexKey,
+		func(o client.Object) []string {
+			dnsRecord := o.(*cloudflareoperatoriov1.DNSRecord)
+			return []string{dnsRecord.Spec.IPRef.Name}
+		}); err != nil {
+		return err
+	}
+
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&cloudflareoperatoriov1.DNSRecord{}).
+		Watches(&cloudflareoperatoriov1.IP{}, handler.EnqueueRequestsFromMapFunc(r.requestsForIPChange)).
 		Complete(r)
 }
 
@@ -372,3 +383,27 @@ func compareDNSRecord(dnsRecordSpec cloudflareoperatoriov1.DNSRecordSpec, existi
 
 	return isEqual
 }
+
+// requestsForIPChange returns a list of reconcile.Requests for DNSRecords that need to be reconciled
+func (r *DNSRecordReconciler) requestsForIPChange(ctx context.Context, o client.Object) []reconcile.Request {
+	ip, ok := o.(*cloudflareoperatoriov1.IP)
+	if !ok {
+		err := fmt.Errorf("expected a DNSRecord, got %T", o)
+		ctrl.LoggerFrom(ctx).Error(err, "failed to get requests for IP change")
+		return nil
+	}
+
+	var dnsRecords cloudflareoperatoriov1.DNSRecordList
+	if err := r.List(ctx, &dnsRecords, client.MatchingFields{
+		cloudflareoperatoriov1.IPRefIndexKey: client.ObjectKeyFromObject(ip).Name,
+	}); err != nil {
+		ctrl.LoggerFrom(ctx).Error(err, "failed to list DNSRecords for IP change")
+		return nil
+	}
+
+	reqs := make([]reconcile.Request, 0, len(dnsRecords.Items))
+	for i := range dnsRecords.Items {
+		reqs = append(reqs, reconcile.Request{NamespacedName: client.ObjectKeyFromObject(&dnsRecords.Items[i])})
+	}
+	return reqs
+}

internal/controller/ip_controller.go

@@ -119,11 +119,6 @@ func (r *IPReconciler) reconcileIP(ctx context.Context, ip *cloudflareoperatorio
 		}
 	}
 
-	if err := r.updateDNSRecords(ctx, ip); err != nil {
-		r.markFailed(ip, err)
-		return ctrl.Result{}
-	}
-
 	apimeta.SetStatusCondition(&ip.Status.Conditions, metav1.Condition{
 		Type:               "Ready",
 		Status:             "True",
@@ -141,27 +136,6 @@ func (r *IPReconciler) reconcileIP(ctx context.Context, ip *cloudflareoperatorio
 	return ctrl.Result{}
 }
 
-// updateDNSRecords updates the DNS records with the new IP
-func (r *IPReconciler) updateDNSRecords(ctx context.Context, ip *cloudflareoperatoriov1.IP) error {
-	dnsRecords := &cloudflareoperatoriov1.DNSRecordList{}
-	if err := r.List(ctx, dnsRecords); err != nil {
-		return err
-	}
-	for _, dnsRecord := range dnsRecords.Items {
-		if dnsRecord.Spec.IPRef.Name != ip.Name {
-			continue
-		}
-		if dnsRecord.Spec.Content == ip.Spec.Address {
-			continue
-		}
-		dnsRecord.Spec.Content = ip.Spec.Address
-		if err := r.Update(ctx, &dnsRecord); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
 // getIPSource returns the IP gathered from the IPSource
 func (r *IPReconciler) getIPSource(ctx context.Context, source cloudflareoperatoriov1.IPSpecIPSources) (string, error) {
 	log := ctrl.LoggerFrom(ctx)