Skip to content

Commit 6c7fcca

Browse files
authored
Fix policy in case of hostless VS (#3328)
1 parent 5a33ccf commit 6c7fcca

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

pkg/controller/resourceConfig.go

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3043,15 +3043,14 @@ func hasWildcardHost(hosts []string) bool {
30433043
// getUniqueHosts returns unique hosts from host and hostAliases
30443044
func getUniqueHosts(host string, hostAliases []string) []string {
30453045
uniqueHostsMap := make(map[string]struct{})
3046-
if host != "" {
3047-
uniqueHostsMap[host] = struct{}{}
3048-
}
3049-
for _, host := range hostAliases {
3050-
uniqueHostsMap[host] = struct{}{}
3051-
}
3046+
uniqueHostsMap[host] = struct{}{}
30523047
var uniqueHosts []string
3053-
for host := range uniqueHostsMap {
3054-
uniqueHosts = append(uniqueHosts, host)
3048+
uniqueHosts = append(uniqueHosts, host)
3049+
for _, host := range hostAliases {
3050+
if _, ok := uniqueHostsMap[host]; !ok {
3051+
uniqueHostsMap[host] = struct{}{}
3052+
uniqueHosts = append(uniqueHosts, host)
3053+
}
30553054
}
30563055
return uniqueHosts
30573056
}

pkg/controller/resourceConfig_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1802,9 +1802,9 @@ var _ = Describe("Resource Config Tests", func() {
18021802
It("Verifies getUniqueHosts", func() {
18031803
Expect(getUniqueHosts(vs.Spec.Host, vs.Spec.HostAliases)).To(ConsistOf([]string{vs.Spec.Host}), "Incorrect unique hosts")
18041804
vs.Spec.Host = ""
1805-
Expect(getUniqueHosts(vs.Spec.Host, vs.Spec.HostAliases)).To(BeNil(), "Incorrect unique hosts")
1805+
Expect(getUniqueHosts(vs.Spec.Host, vs.Spec.HostAliases)).To(ConsistOf([]string{""}), "Incorrect unique hosts")
18061806
vs.Spec.HostAliases = []string{"test1.com", "test2.com", "test1.com", "test1.com", "test2.com"}
1807-
Expect(getUniqueHosts(vs.Spec.Host, vs.Spec.HostAliases)).To(ConsistOf([]string{"test1.com", "test2.com"}), "Incorrect unique hosts")
1807+
Expect(getUniqueHosts(vs.Spec.Host, vs.Spec.HostAliases)).To(ConsistOf([]string{"", "test1.com", "test2.com"}), "Incorrect unique hosts")
18081808
vs.Spec.Host = "test.com"
18091809
Expect(getUniqueHosts(vs.Spec.Host, vs.Spec.HostAliases)).To(ConsistOf([]string{"test.com", "test1.com", "test2.com"}), "Incorrect unique hosts")
18101810
vs.Spec.Host = "test1.com"

0 commit comments

Comments
 (0)