updates after review

Kuadrant · Mar 12, 2024 · 56f1ea9 · 56f1ea9
1 parent 9214e66
commit 56f1ea9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git a/api/v1alpha1/dnsrecord_types.go b/api/v1alpha1/dnsrecord_types.go
@@ -106,14 +106,7 @@ const (
 	DefaultGeo string = "default"
 )
 
-const wildcardPrefix = "*."
-
-func (s *DNSRecord) isWildCardRoot() bool {
-	if s.Spec.RootHost != nil {
-		return strings.HasPrefix(*s.Spec.RootHost, wildcardPrefix)
-	}
-	return false
-}
+const WildcardPrefix = "*."
 
 func (s *DNSRecord) Validate() error {
 	if s.Spec.RootHost != nil {
@@ -125,9 +118,7 @@ func (s *DNSRecord) Validate() error {
 			return fmt.Errorf("no endpoints defined for DNSRecord. Nothing to do.")
 		}
 
-		if s.isWildCardRoot() {
-			root = strings.Replace(root, wildcardPrefix, "", 1)
-		}
+		root, _ = strings.CutPrefix(root, WildcardPrefix)
 
 		rootEndpointFound := false
 		for _, ep := range s.Spec.Endpoints {

diff --git a/internal/controller/dnsrecord_controller.go b/internal/controller/dnsrecord_controller.go
@@ -228,8 +228,11 @@ func setDNSRecordCondition(dnsRecord *v1alpha1.DNSRecord, conditionType string,
 
 func (r *DNSRecordReconciler) applyChanges(ctx context.Context, dnsRecord *v1alpha1.DNSRecord, managedZone *v1alpha1.ManagedZone, isDelete bool) error {
 	logger := log.FromContext(ctx)
-
-	rootDomainFilter := externaldnsendpoint.NewDomainFilter([]string{managedZone.Spec.DomainName})
+	filterDomain, _ := strings.CutPrefix(*dnsRecord.Spec.RootHost, v1alpha1.WildcardPrefix)
+	if dnsRecord.Spec.RootHost != nil {
+		filterDomain = *dnsRecord.Spec.RootHost
+	}
+	rootDomainFilter := externaldnsendpoint.NewDomainFilter([]string{filterDomain})
 
 	providerConfig := provider.Config{
 		DomainFilter:   externaldnsendpoint.NewDomainFilter([]string{managedZone.Spec.DomainName}),