Merge pull request #568 from jcmoraisjr/jm-ann-approot-1
Revert merge annotations to the implicit root context
This commit is contained in:
commit
cfef9d82fd
1 changed files with 0 additions and 6 deletions
|
@ -623,12 +623,6 @@ func (ic *GenericController) getBackendServers() ([]*ingress.Backend, []*ingress
|
|||
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 &&
|
||||
host != defServerName {
|
||||
glog.V(3).Infof("ingress rule %v/%v does not contain HTTP rules, using default backend", ing.Namespace, ing.Name)
|
||||
|
|
Loading…
Reference in a new issue