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

Merge pull request #1610 from rowleyaj/server-alias

Browse source 
Only set alias if not already set
This commit is contained in:
Manuel Alejandro de Brito Fontes 2017-10-27 10:59:13 -03:00 committed by GitHub
commit 28dbd9fd2d
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkg/ingress/controller/controller.go
View file

@ -1015,10 +1015,15 @@ func (ic *GenericController) createServers(data []*extensions.Ingress,
}
// setup server aliases
servers[host].Alias = aliasAnnotation
if aliasAnnotation != "" {
if _, ok := aliases[aliasAnnotation]; !ok {
aliases[aliasAnnotation] = host
if servers[host].Alias == "" {
servers[host].Alias = aliasAnnotation
if _, ok := aliases[aliasAnnotation]; !ok {
aliases[aliasAnnotation] = host
}
} else {
glog.Warningf("ingress %v/%v for host %v contains an Alias but one has already been configured.",
ing.Namespace, ing.Name, host)
}
}