Merge pull request kubernetes-retired#898 from aledbf/sort-locations

bprashanth · bprashanth · commit 2db2324c6ca9 · 2016-05-04T08:38:01.000-07:00
NGINX Ingress controller Sort locations
diff --git a/controllers/nginx/nginx/nginx.go b/controllers/nginx/nginx/nginx.go
@@ -88,12 +88,13 @@ type Location struct {
 }
 
 // LocationByPath sorts location by path
+// Location / is the last one
 type LocationByPath []*Location
 
 func (c LocationByPath) Len() int      { return len(c) }
 func (c LocationByPath) Swap(i, j int) { c[i], c[j] = c[j], c[i] }
 func (c LocationByPath) Less(i, j int) bool {
-	return c[i].Path < c[j].Path
+	return c[i].Path > c[j].Path
 }
 
 // NewDefaultServer return an UpstreamServer to be use as default server that returns 503.

Original file line number	Diff line number	Diff line change
`@@ -88,12 +88,13 @@ type Location struct {`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`// LocationByPath sorts location by path`
	`91`	`+// Location / is the last one`
`91`	`92`	`type LocationByPath []*Location`
`92`	`93`
`93`	`94`	`func (c LocationByPath) Len() int { return len(c) }`
`94`	`95`	`func (c LocationByPath) Swap(i, j int) { c[i], c[j] = c[j], c[i] }`
`95`	`96`	`func (c LocationByPath) Less(i, j int) bool {`
`96`		`- return c[i].Path < c[j].Path`
	`97`	`+ return c[i].Path > c[j].Path`
`97`	`98`	`}`
`98`	`99`
`99`	`100`	`// NewDefaultServer return an UpstreamServer to be use as default server that returns 503.`