baalajimaestro/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #588 from philk/kubernetes-priorities

Browse source 
Prioritize kubernetes routes by path length
This commit is contained in:
Vincent Demeester 2016-08-05 11:08:07 +02:00 committed by GitHub
commit 1fc4c56bc4
3 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
provider/kubernetes.go
View file

@ -209,6 +209,7 @@ func (provider *Kubernetes) loadIngresses(k8sClient k8s.Client) (*types.Configur
Backend: r.Host + pa.Path, Backend: r.Host + pa.Path,
PassHostHeader: PassHostHeader, PassHostHeader: PassHostHeader,
Routes: make(map[string]types.Route), Routes: make(map[string]types.Route),
Priority: len(pa.Path),
} }
} }
if len(r.Host) > 0 { if len(r.Host) > 0 {

25
provider/kubernetes_test.go
View file

@ -237,6 +237,7 @@ func TestLoadIngresses(t *testing.T) {
"foo/bar": { "foo/bar": {
Backend: "foo/bar", Backend: "foo/bar",
PassHostHeader: true, PassHostHeader: true,
Priority: len("/bar"),
Routes: map[string]types.Route{ Routes: map[string]types.Route{
"/bar": { "/bar": {
Rule: "PathPrefix:/bar", Rule: "PathPrefix:/bar",
@ -425,7 +426,8 @@ func TestRuleType(t *testing.T) {
expected := map[string]*types.Frontend{ expected := map[string]*types.Frontend{
"foo1/bar1": { "foo1/bar1": {
Backend: "foo1/bar1", Backend: "foo1/bar1",
Priority: len("/bar1"),
Routes: map[string]types.Route{ Routes: map[string]types.Route{
"/bar1": { "/bar1": {
Rule: "PathPrefixStrip:/bar1", Rule: "PathPrefixStrip:/bar1",
@ -436,7 +438,8 @@ func TestRuleType(t *testing.T) {
}, },
}, },
"foo1/bar2": { "foo1/bar2": {
Backend: "foo1/bar2", Backend: "foo1/bar2",
Priority: len("/bar2"),
Routes: map[string]types.Route{ Routes: map[string]types.Route{
"/bar2": { "/bar2": {
Rule: "Path:/bar2", Rule: "Path:/bar2",
@ -447,7 +450,8 @@ func TestRuleType(t *testing.T) {
}, },
}, },
"foo2/bar1": { "foo2/bar1": {
Backend: "foo2/bar1", Backend: "foo2/bar1",
Priority: len("/bar1"),
Routes: map[string]types.Route{ Routes: map[string]types.Route{
"/bar1": { "/bar1": {
Rule: "PathPrefix:/bar1", Rule: "PathPrefix:/bar1",
@ -458,7 +462,8 @@ func TestRuleType(t *testing.T) {
}, },
}, },
"foo2/bar2": { "foo2/bar2": {
Backend: "foo2/bar2", Backend: "foo2/bar2",
Priority: len("/bar2"),
Routes: map[string]types.Route{ Routes: map[string]types.Route{
"/bar2": { "/bar2": {
Rule: "PathStrip:/bar2", Rule: "PathStrip:/bar2",
@ -469,7 +474,8 @@ func TestRuleType(t *testing.T) {
}, },
}, },
"foo1/bar3": { "foo1/bar3": {
Backend: "foo1/bar3", Backend: "foo1/bar3",
Priority: len("/bar3"),
Routes: map[string]types.Route{ Routes: map[string]types.Route{
"/bar3": { "/bar3": {
Rule: "PathPrefix:/bar3", Rule: "PathPrefix:/bar3",
@ -559,7 +565,8 @@ func TestGetPassHostHeader(t *testing.T) {
}, },
Frontends: map[string]*types.Frontend{ Frontends: map[string]*types.Frontend{
"foo/bar": { "foo/bar": {
Backend: "foo/bar", Backend: "foo/bar",
Priority: len("/bar"),
Routes: map[string]types.Route{ Routes: map[string]types.Route{
"/bar": { "/bar": {
Rule: "PathPrefix:/bar", Rule: "PathPrefix:/bar",
@ -869,6 +876,7 @@ func TestLoadNamespacedIngresses(t *testing.T) {
"foo/bar": { "foo/bar": {
Backend: "foo/bar", Backend: "foo/bar",
PassHostHeader: true, PassHostHeader: true,
Priority: len("/bar"),
Routes: map[string]types.Route{ Routes: map[string]types.Route{
"/bar": { "/bar": {
Rule: "PathPrefix:/bar", Rule: "PathPrefix:/bar",
@ -1116,6 +1124,7 @@ func TestLoadMultipleNamespacedIngresses(t *testing.T) {
"foo/bar": { "foo/bar": {
Backend: "foo/bar", Backend: "foo/bar",
PassHostHeader: true, PassHostHeader: true,
Priority: len("/bar"),
Routes: map[string]types.Route{ Routes: map[string]types.Route{
"/bar": { "/bar": {
Rule: "PathPrefix:/bar", Rule: "PathPrefix:/bar",
@ -1137,6 +1146,7 @@ func TestLoadMultipleNamespacedIngresses(t *testing.T) {
"awesome/quix": { "awesome/quix": {
Backend: "awesome/quix", Backend: "awesome/quix",
PassHostHeader: true, PassHostHeader: true,
Priority: len("/quix"),
Routes: map[string]types.Route{ Routes: map[string]types.Route{
"/quix": { "/quix": {
Rule: "PathPrefix:/quix", Rule: "PathPrefix:/quix",
@ -1226,7 +1236,8 @@ func TestHostlessIngress(t *testing.T) {
}, },
Frontends: map[string]*types.Frontend{ Frontends: map[string]*types.Frontend{
"/bar": { "/bar": {
Backend: "/bar", Backend: "/bar",
Priority: len("/bar"),
Routes: map[string]types.Route{ Routes: map[string]types.Route{
"/bar": { "/bar": {
Rule: "PathPrefix:/bar", Rule: "PathPrefix:/bar",

1
templates/kubernetes.tmpl
View file

@ -9,6 +9,7 @@
[frontends]{{range $frontendName, $frontend := .Frontends}} [frontends]{{range $frontendName, $frontend := .Frontends}}
[frontends."{{$frontendName}}"] [frontends."{{$frontendName}}"]
backend = "{{$frontend.Backend}}" backend = "{{$frontend.Backend}}"
priority = {{$frontend.Priority}}
passHostHeader = {{$frontend.PassHostHeader}} passHostHeader = {{$frontend.PassHostHeader}}
{{range $routeName, $route := $frontend.Routes}} {{range $routeName, $route := $frontend.Routes}}
[frontends."{{$frontendName}}".routes."{{$routeName}}"] [frontends."{{$frontendName}}".routes."{{$routeName}}"]