mirror of
https://github.com/wahyd4/ingress-nginx.git
synced 2026-08-09 05:16:27 +10:00
Fix server aliases (#5003)
This commit is contained in:
@@ -1154,12 +1154,28 @@ func (n *NGINXController) createServers(data []*ingress.Ingress,
|
||||
}
|
||||
|
||||
for host, hostAliases := range allAliases {
|
||||
for index, alias := range hostAliases {
|
||||
if _, ok := servers[alias]; ok {
|
||||
klog.Warningf("Conflicting hostname (%v) and alias (%v). Removing alias to avoid conflicts.", host, alias)
|
||||
servers[host].Aliases = append(servers[host].Aliases[:index], servers[host].Aliases[index+1:]...)
|
||||
}
|
||||
if _, ok := servers[host]; !ok {
|
||||
continue
|
||||
}
|
||||
|
||||
uniqAliases := sets.NewString()
|
||||
for _, alias := range hostAliases {
|
||||
if alias == host {
|
||||
continue
|
||||
}
|
||||
|
||||
if _, ok := servers[alias]; ok {
|
||||
continue
|
||||
}
|
||||
|
||||
if uniqAliases.Has(alias) {
|
||||
continue
|
||||
}
|
||||
|
||||
uniqAliases.Insert(alias)
|
||||
}
|
||||
|
||||
servers[host].Aliases = uniqAliases.List()
|
||||
}
|
||||
|
||||
return servers
|
||||
|
||||
Reference in New Issue
Block a user