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

Merge pull request #568 from jcmoraisjr/jm-ann-approot-1

Browse source 
Revert merge annotations to the implicit root context
This commit is contained in:
Manuel Alejandro de Brito Fontes 2017-04-06 22:52:44 -03:00 committed by GitHub
commit cfef9d82fd
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/pkg/ingress/controller/controller.go
View file

@ -623,12 +623,6 @@ func (ic *GenericController) getBackendServers() ([]*ingress.Backend, []*ingress
server = servers[defServerName] server = servers[defServerName]
} }
// Add annotations to location of default backend (root context)
if len(server.Locations) > 0 {
loc := server.Locations[0]
mergeLocationAnnotations(loc, anns)
}
if rule.HTTP == nil && if rule.HTTP == nil &&
host != defServerName { host != defServerName {
glog.V(3).Infof("ingress rule %v/%v does not contain HTTP rules, using default backend", ing.Namespace, ing.Name) glog.V(3).Infof("ingress rule %v/%v does not contain HTTP rules, using default backend", ing.Namespace, ing.Name)