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

Improve text, error level, tests...

Browse source
This commit is contained in:
Per Bernhardt 2019-03-12 13:52:52 +01:00
parent 8a40e82ffb
commit c995e13249
2 changed files with 33 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1199,22 +1199,27 @@ func mergeAlternativeBackends(ing *ingress.Ingress, upstreams map[string]*ingres
altUps := upstreams[upsName]
merged := false
if altUps == nil {
klog.Warningf("alternative backend %s has already been removed", upsName)
} else {
for _, loc := range servers[defServerName].Locations {
priUps := upstreams[loc.Backend]
merged := false
if canMergeBackend(priUps, altUps) {
klog.V(2).Infof("matching backend %v found for alternative backend %v",
priUps.Name, altUps.Name)
for _, loc := range servers[defServerName].Locations {
priUps := upstreams[loc.Backend]
merged = mergeAlternativeBackend(priUps, altUps)
if canMergeBackend(priUps, altUps) {
klog.V(2).Infof("matching backend %v found for alternative backend %v",
priUps.Name, altUps.Name)
merged = mergeAlternativeBackend(priUps, altUps)
}
}
}
if !merged {
klog.Warningf("unable to find real backend for alternative backend %v. Deleting.", altUps.Name)
delete(upstreams, altUps.Name)
if !merged {
klog.Warningf("unable to find real backend for alternative backend %v. Deleting.", altUps.Name)
delete(upstreams, altUps.Name)
}
}
}
@ -1225,7 +1230,7 @@ func mergeAlternativeBackends(ing *ingress.Ingress, upstreams map[string]*ingres
altUps := upstreams[upsName]
if altUps == nil {
klog.Errorf("alternative backend %s has already be removed", upsName)
klog.Warningf("alternative backend %s has already been removed", upsName)
continue
}