Fix server aliases (#5003)
This commit is contained in:
parent
431637d81a
commit
54c30b91c9
1 changed files with 21 additions and 5 deletions
|
@ -1154,12 +1154,28 @@ func (n *NGINXController) createServers(data []*ingress.Ingress,
|
||||||
}
|
}
|
||||||
|
|
||||||
for host, hostAliases := range allAliases {
|
for host, hostAliases := range allAliases {
|
||||||
for index, alias := range hostAliases {
|
if _, ok := servers[host]; !ok {
|
||||||
if _, ok := servers[alias]; ok {
|
continue
|
||||||
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:]...)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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
|
return servers
|
||||||
|
|
Loading…
Reference in a new issue