Fix policy in case of hostless VS (#3328)

F5Networks · Mar 13, 2024 · 6c7fcca · 6c7fcca
1 parent 5a33ccf
commit 6c7fcca
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/pkg/controller/resourceConfig.go b/pkg/controller/resourceConfig.go
@@ -3043,15 +3043,14 @@ func hasWildcardHost(hosts []string) bool {
 // getUniqueHosts returns unique hosts from host and hostAliases
 func getUniqueHosts(host string, hostAliases []string) []string {
 	uniqueHostsMap := make(map[string]struct{})
-	if host != "" {
-		uniqueHostsMap[host] = struct{}{}
-	}
-	for _, host := range hostAliases {
-		uniqueHostsMap[host] = struct{}{}
-	}
+	uniqueHostsMap[host] = struct{}{}
 	var uniqueHosts []string
-	for host := range uniqueHostsMap {
-		uniqueHosts = append(uniqueHosts, host)
+	uniqueHosts = append(uniqueHosts, host)
+	for _, host := range hostAliases {
+		if _, ok := uniqueHostsMap[host]; !ok {
+			uniqueHostsMap[host] = struct{}{}
+			uniqueHosts = append(uniqueHosts, host)
+		}
 	}
 	return uniqueHosts
 }
diff --git a/pkg/controller/resourceConfig_test.go b/pkg/controller/resourceConfig_test.go
@@ -1802,9 +1802,9 @@ var _ = Describe("Resource Config Tests", func() {
 		It("Verifies getUniqueHosts", func() {
 			Expect(getUniqueHosts(vs.Spec.Host, vs.Spec.HostAliases)).To(ConsistOf([]string{vs.Spec.Host}), "Incorrect unique hosts")
 			vs.Spec.Host = ""
-			Expect(getUniqueHosts(vs.Spec.Host, vs.Spec.HostAliases)).To(BeNil(), "Incorrect unique hosts")
+			Expect(getUniqueHosts(vs.Spec.Host, vs.Spec.HostAliases)).To(ConsistOf([]string{""}), "Incorrect unique hosts")
 			vs.Spec.HostAliases = []string{"test1.com", "test2.com", "test1.com", "test1.com", "test2.com"}
-			Expect(getUniqueHosts(vs.Spec.Host, vs.Spec.HostAliases)).To(ConsistOf([]string{"test1.com", "test2.com"}), "Incorrect unique hosts")
+			Expect(getUniqueHosts(vs.Spec.Host, vs.Spec.HostAliases)).To(ConsistOf([]string{"", "test1.com", "test2.com"}), "Incorrect unique hosts")
 			vs.Spec.Host = "test.com"
 			Expect(getUniqueHosts(vs.Spec.Host, vs.Spec.HostAliases)).To(ConsistOf([]string{"test.com", "test1.com", "test2.com"}), "Incorrect unique hosts")
 			vs.Spec.Host = "test1.com"