[Fix] Operator: DNS handling fixed

Pavan-SAP · Pavan-SAP · commit 2830363e8e7e · 2025-08-05T15:39:27.000+02:00
Recent changes/refactoring caused an issue due to misplaced slice append
 causing only 1 subdomain entry to be handled by domain resources.
This change fixes the issue.
diff --git a/internal/controller/dns-manager.go b/internal/controller/dns-manager.go
@@ -171,6 +171,11 @@ func getDnsInfo[T v1alpha1.DomainEntity](c *Controller, dom T) (resolvedDNSInfo
 	tpl := template.New("dnsTemplate").Funcs(sprig.FuncMap())
 
 	resolvedDNSInfo = []*dnsInfo{}
+	checkAndAppendDNSInfo := func(dnsInfo *dnsInfo) {
+		if dnsInfo != nil {
+			resolvedDNSInfo = append(resolvedDNSInfo, dnsInfo)
+		}
+	}
 
 	for _, dnsTemplate := range dnsTemplates {
 		var parsedDnsInfo *dnsInfo
@@ -180,6 +185,8 @@ func getDnsInfo[T v1alpha1.DomainEntity](c *Controller, dom T) (resolvedDNSInfo
 			if err != nil {
 				return nil, err
 			}
+			checkAndAppendDNSInfo(parsedDnsInfo)
+			continue
 		}
 		for subDomain, appId := range subdomainInfo {
 			domVars["subDomain"] = subDomain
@@ -188,9 +195,7 @@ func getDnsInfo[T v1alpha1.DomainEntity](c *Controller, dom T) (resolvedDNSInfo
 				return nil, err
 			}
 			parsedDnsInfo.appId = appId
-		}
-		if parsedDnsInfo != nil {
-			resolvedDNSInfo = append(resolvedDNSInfo, parsedDnsInfo)
+			checkAndAppendDNSInfo(parsedDnsInfo)
 		}
 	}
 
diff --git a/internal/controller/reconcile_test.go b/internal/controller/reconcile_test.go
@@ -45,7 +45,6 @@ const (
 	globalAccountId    = "global-id-test"
 	primaryDomain      = "app.sme.sap.com"
 	secondaryDomain    = "sec.sme.sap.com"
-	dnsTarget          = "public-ingress.some.cluster.sap"
 	defaultVersion     = "0.0.1"
 )
 
diff --git a/internal/controller/testdata/domain/domain-with-customDNS-services.yaml b/internal/controller/testdata/domain/domain-with-customDNS-services.yaml
@@ -36,10 +36,10 @@ metadata:
   annotations:
     dns.gardener.cloud/class: garden
     sme.sap.com/owner-identifier: Domain.default.test-cap-01-primary
-    sme.sap.com/resource-hash: b2cd5723c32ec9f60aba01365d37f1382d4c78e1e3b427c8b97aad742a613af3
+    sme.sap.com/resource-hash: 8d75feef05a17c4d0ac51fa33c1439065af397aefd5ba43c2defb44254ec4598
   generateName: test-cap-01-primary-
   labels:
-    sme.sap.com/btp-app-identifier-hash: "f20cc8aeb2003b3abc33f749a16bd53544b6bab2"
+    sme.sap.com/btp-app-identifier-hash: ""
     sme.sap.com/owner-generation: "0"
     sme.sap.com/owner-identifier-hash: f3b9e769089130d9d80dc05b68fb1564beb8cccc
     sme.sap.com/dns-name-hash: 7f91a70a773eaf2e8e9c78020ddadf7f66119300
diff --git a/internal/controller/testdata/domain/domain-with-customDNS-tenant.yaml b/internal/controller/testdata/domain/domain-with-customDNS-tenant.yaml
@@ -36,10 +36,10 @@ metadata:
   annotations:
     dns.gardener.cloud/class: garden
     sme.sap.com/owner-identifier: Domain.default.test-cap-01-primary
-    sme.sap.com/resource-hash: b2cd5723c32ec9f60aba01365d37f1382d4c78e1e3b427c8b97aad742a613af3
+    sme.sap.com/resource-hash: 8d75feef05a17c4d0ac51fa33c1439065af397aefd5ba43c2defb44254ec4598
   generateName: test-cap-01-primary-
   labels:
-    sme.sap.com/btp-app-identifier-hash: "f20cc8aeb2003b3abc33f749a16bd53544b6bab2"
+    sme.sap.com/btp-app-identifier-hash: ""
     sme.sap.com/owner-generation: "0"
     sme.sap.com/owner-identifier-hash: f3b9e769089130d9d80dc05b68fb1564beb8cccc
     sme.sap.com/dns-name-hash: 7f91a70a773eaf2e8e9c78020ddadf7f66119300

Original file line number	Diff line number	Diff line change
`@@ -171,6 +171,11 @@ func getDnsInfo[T v1alpha1.DomainEntity](c *Controller, dom T) (resolvedDNSInfo`
`171`	`171`	`tpl := template.New("dnsTemplate").Funcs(sprig.FuncMap())`
`172`	`172`
`173`	`173`	`resolvedDNSInfo = []*dnsInfo{}`
	`174`	`+ checkAndAppendDNSInfo := func(dnsInfo *dnsInfo) {`
	`175`	`+ if dnsInfo != nil {`
	`176`	`+ resolvedDNSInfo = append(resolvedDNSInfo, dnsInfo)`
	`177`	`+ }`
	`178`	`+ }`
`174`	`179`
`175`	`180`	`for _, dnsTemplate := range dnsTemplates {`
`176`	`181`	`var parsedDnsInfo *dnsInfo`
`@@ -180,6 +185,8 @@ func getDnsInfo[T v1alpha1.DomainEntity](c *Controller, dom T) (resolvedDNSInfo`
`180`	`185`	`if err != nil {`
`181`	`186`	`return nil, err`
`182`	`187`	`}`
	`188`	`+ checkAndAppendDNSInfo(parsedDnsInfo)`
	`189`	`+ continue`
`183`	`190`	`}`
`184`	`191`	`for subDomain, appId := range subdomainInfo {`
`185`	`192`	`domVars["subDomain"] = subDomain`
`@@ -188,9 +195,7 @@ func getDnsInfo[T v1alpha1.DomainEntity](c *Controller, dom T) (resolvedDNSInfo`
`188`	`195`	`return nil, err`
`189`	`196`	`}`
`190`	`197`	`parsedDnsInfo.appId = appId`
`191`		`- }`
`192`		`- if parsedDnsInfo != nil {`
`193`		`- resolvedDNSInfo = append(resolvedDNSInfo, parsedDnsInfo)`
	`198`	`+ checkAndAppendDNSInfo(parsedDnsInfo)`
`194`	`199`	`}`
`195`	`200`	`}`
`196`	`201`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,6 @@ const (`
`45`	`45`	`globalAccountId = "global-id-test"`
`46`	`46`	`primaryDomain = "app.sme.sap.com"`
`47`	`47`	`secondaryDomain = "sec.sme.sap.com"`
`48`		`- dnsTarget = "public-ingress.some.cluster.sap"`
`49`	`48`	`defaultVersion = "0.0.1"`
`50`	`49`	`)`
`51`	`50`