Merge pull request #684 from paramite/OSPRH-16162

openshift-merge-bot[bot] · web-flow · commit dfdb0b83304a · 2025-05-15T14:50:48.000Z
Don't assume dns_search_domains item length
diff --git a/controllers/metricstorage_controller.go b/controllers/metricstorage_controller.go
@@ -1217,7 +1217,7 @@ func getAddressFromIPSet(
 	if ok {
 		for _, domain := range domains {
 			domainString, ok := domain.(string)
-			if ok && domainString[0:8] == "ctlplane" {
+			if ok && strings.HasPrefix(domainString, "ctlplane") {
 				ctlplaneDNSDomain = domainString
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -1217,7 +1217,7 @@ func getAddressFromIPSet(`
`1217`	`1217`	`if ok {`
`1218`	`1218`	`for _, domain := range domains {`
`1219`	`1219`	`domainString, ok := domain.(string)`
`1220`		`- if ok && domainString[0:8] == "ctlplane" {`
	`1220`	`+ if ok && strings.HasPrefix(domainString, "ctlplane") {`
`1221`	`1221`	`ctlplaneDNSDomain = domainString`
`1222`	`1222`	`}`
`1223`	`1223`	`}`