Merge pull request #391 from containeroo/fix/ip

Fix ip controller issues

Author: rxbn

internal/controller/ingress_controller.go

@@ -179,9 +179,10 @@ func (r *IngressReconciler) parseAnnotations(annotations map[string]string) clou
 
 // createDNSRecord creates a DNSRecord object
 func (r *IngressReconciler) createDNSRecord(ctx context.Context, ingress *networkingv1.Ingress, dnsRecordSpec cloudflareoperatoriov1.DNSRecordSpec) error {
+	replacer := strings.NewReplacer(".", "-", "*", "wildcard")
 	dnsRecord := &cloudflareoperatoriov1.DNSRecord{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      strings.ReplaceAll(dnsRecordSpec.Name, ".", "-"),
+			Name:      replacer.Replace(dnsRecordSpec.Name),
 			Namespace: ingress.Namespace,
 			Labels: map[string]string{
 				"app.kubernetes.io/managed-by": "cloudflare-operator",

internal/controller/ip_controller.go

@@ -24,7 +24,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"math/rand"
+	"math/rand/v2"
 	"net"
 	"net/http"
 	"net/url"
@@ -223,11 +223,12 @@ func (r *IPReconciler) getIPSource(ctx context.Context, source cloudflareoperato
 		extractedIP = match[1]
 	}
 
+	extractedIP = strings.TrimSpace(extractedIP)
 	if net.ParseIP(extractedIP) == nil {
 		return "", fmt.Errorf("ip from source %s is invalid: %s", source.URL, extractedIP)
 	}
 
-	return strings.TrimSpace(extractedIP), nil
+	return extractedIP, nil
 }
 
 // handleStatic handles the static ip
@@ -249,19 +250,21 @@ func (r *IPReconciler) handleDynamic(ctx context.Context, ip *cloudflareoperator
 	if len(ip.Spec.IPSources) == 0 {
 		return errors.New("IP sources are required for dynamic IPs")
 	}
-	if len(ip.Spec.IPSources) > 1 {
-		rand.Shuffle(len(ip.Spec.IPSources), func(i, j int) {
-			ip.Spec.IPSources[i], ip.Spec.IPSources[j] = ip.Spec.IPSources[j], ip.Spec.IPSources[i]
-		})
-	}
+	// DeepCopy the ip sources to avoid modifying the original slice which would cause the object to be updated on every reconcile
+	// which would lead to an infinite loop
+	ipSources := ip.Spec.DeepCopy().IPSources
+	rand.Shuffle(len(ipSources), func(i, j int) {
+		ipSources[i], ipSources[j] = ipSources[j], ipSources[i]
+	})
 	var ipSourceError error
-	for _, source := range ip.Spec.IPSources {
+	for _, source := range ipSources {
 		response, err := r.getIPSource(ctx, source)
 		if err != nil {
 			ipSourceError = err
 			continue
 		}
 		ip.Spec.Address = response
+		ipSourceError = nil
 		break
 	}
 	if ipSourceError != nil {