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

Merge pull request #3417 from Shopify/fix_canary_merge_self_def

Browse source 
bugfix: do not merge catch-all canary backends with itself
This commit is contained in:
k8s-ci-robot 2018-11-20 05:03:52 -08:00 committed by GitHub
commit 96f5ae6668
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1135,13 +1135,15 @@ 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",
upstreams[defLoc.Backend].Name, ups.Name)
glog.Infof("matching backend %v found for alternative backend %v", upstreams[defLoc.Backend].AlternativeBackends =
upstreams[defLoc.Backend].Name, ups.Name) append(upstreams[defLoc.Backend].AlternativeBackends, ups.Name)
}
upstreams[defLoc.Backend].AlternativeBackends = }
append(upstreams[defLoc.Backend].AlternativeBackends, ups.Name)
} }
for _, rule := range ing.Spec.Rules { for _, rule := range ing.Spec.Rules {