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

Detect path collisions in Ingress rules

Browse source
This commit is contained in:
Manuel de Brito Fontes 2016-04-12 23:19:08 -03:00
parent 64791c35f0
commit 724a829eae
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
controllers/nginx/controller.go
View file

@ -458,9 +458,9 @@ func (lbc *loadBalancerController) getUpstreamServers(data []interface{}) ([]*ng
}
server := servers[rule.Host]
locations := []*nginx.Location{}
for _, path := range rule.HTTP.Paths {
upsName := fmt.Sprintf("%v-%v-%v", ing.GetNamespace(), path.Backend.ServiceName, path.Backend.ServicePort.IntValue())
ups := upstreams[upsName]
@ -490,18 +490,23 @@ func (lbc *loadBalancerController) getUpstreamServers(data []interface{}) ([]*ng
}
}
for _, ups := range upstreams {
if upsName == ups.Name {
loc := &nginx.Location{Path: path.Path}
loc.Upstream = *ups
locations = append(locations, loc)
// Validate that there is no another previuous rule
// for the same host and path.
skipLoc := false
for _, loc := range server.Locations {
if loc.Path == path.Path {
lbc.recorder.Eventf(ing, api.EventTypeWarning, "MAPPING", "Path '%v' already defined in another Ingress rule", path)
skipLoc = true
break
}
}
}
for _, loc := range locations {
server.Locations = append(server.Locations, loc)
if skipLoc == false {
server.Locations = append(server.Locations, &nginx.Location{
Path: path.Path,
Upstream: *ups,
})
}
}
}
}