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

Merge pull request #3635 from Shopify/alternative-backend-merge

Browse source 
Fix duplicate alternative backend merging
This commit is contained in:
Kubernetes Prow Robot 2019-01-08 10:30:58 -08:00 committed by GitHub
commit 47addbbe72
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1165,6 +1165,13 @@ func mergeAlternativeBackend(priUps *ingress.Backend, altUps *ingress.Backend) b
return false return false
} }
for _, ab := range priUps.AlternativeBackends {
if ab == altUps.Name {
klog.V(2).Infof("skip merge alternative backend %v into %v, it's already present", altUps.Name, priUps.Name)
return true
}
}
priUps.AlternativeBackends = priUps.AlternativeBackends =
append(priUps.AlternativeBackends, altUps.Name) append(priUps.AlternativeBackends, altUps.Name)