DevFW-CICD/ingress-nginx-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix server aliases (#5003)

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2020-02-02 19:08:55 -03:00 committed by GitHub
parent 431637d81a
commit 54c30b91c9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
internal/ingress/controller/controller.go
View file

@ -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