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

bugfix: do not merge catch-all canary backends with itself

Browse source
This commit is contained in:
Conor Landry 2018-11-13 13:20:15 -05:00
parent a22c656f30
commit ec28539e43
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1008,14 +1008,16 @@ func mergeAlternativeBackends(ing *extensions.Ingress, upstreams map[string]*ing
ups := upstreams[upsName] ups := upstreams[upsName]
defLoc := servers[defServerName].Locations[0] for _, defLoc := range servers[defServerName].Locations {
if !upstreams[defLoc.Backend].NoServer {
glog.Infof("matching backend %v found for alternative backend %v", glog.Infof("matching backend %v found for alternative backend %v",
upstreams[defLoc.Backend].Name, ups.Name) upstreams[defLoc.Backend].Name, ups.Name)
upstreams[defLoc.Backend].AlternativeBackends = upstreams[defLoc.Backend].AlternativeBackends =
append(upstreams[defLoc.Backend].AlternativeBackends, ups.Name) append(upstreams[defLoc.Backend].AlternativeBackends, ups.Name)
} }
}
}
for _, rule := range ing.Spec.Rules { for _, rule := range ing.Spec.Rules {
for _, path := range rule.HTTP.Paths { for _, path := range rule.HTTP.Paths {