diff --git a/pkg/ingress/controller/controller.go b/pkg/ingress/controller/controller.go index 8a1b180fa..0ff68a9ea 100644 --- a/pkg/ingress/controller/controller.go +++ b/pkg/ingress/controller/controller.go @@ -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) } }