From bfa61c8f67cd7e8969e2abbabba6b8bdb9ad1177 Mon Sep 17 00:00:00 2001 From: Ludovic Fernandez Date: Fri, 15 Nov 2019 20:14:04 +0100 Subject: [PATCH] fix: use MaxInt32. --- integration/testdata/rawdata-ingress.json | 4 ++-- .../traefik/fixtures/api_insecure_with_dashboard.json | 4 ++-- .../fixtures/api_insecure_without_dashboard.json | 2 +- pkg/provider/traefik/fixtures/full_configuration.json | 10 +++++----- pkg/provider/traefik/fixtures/ping_simple.json | 2 +- pkg/provider/traefik/fixtures/prometheus_simple.json | 2 +- pkg/provider/traefik/fixtures/rest_insecure.json | 2 +- pkg/provider/traefik/internal.go | 10 +++++----- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/integration/testdata/rawdata-ingress.json b/integration/testdata/rawdata-ingress.json index 74c9acad9..b70c3b552 100644 --- a/integration/testdata/rawdata-ingress.json +++ b/integration/testdata/rawdata-ingress.json @@ -6,7 +6,7 @@ ], "service": "api@internal", "rule": "PathPrefix(`/api`)", - "priority": 9223372036854775806, + "priority": 2147483646, "status": "enabled", "using": [ "traefik" @@ -22,7 +22,7 @@ ], "service": "dashboard@internal", "rule": "PathPrefix(`/`)", - "priority": 9223372036854775805, + "priority": 2147483645, "status": "enabled", "using": [ "traefik" diff --git a/pkg/provider/traefik/fixtures/api_insecure_with_dashboard.json b/pkg/provider/traefik/fixtures/api_insecure_with_dashboard.json index e5374cc5e..60f72a7f7 100644 --- a/pkg/provider/traefik/fixtures/api_insecure_with_dashboard.json +++ b/pkg/provider/traefik/fixtures/api_insecure_with_dashboard.json @@ -7,7 +7,7 @@ ], "service": "api@internal", "rule": "PathPrefix(`/api`)", - "priority": 9223372036854775806 + "priority": 2147483646 }, "dashboard": { "entryPoints": [ @@ -19,7 +19,7 @@ ], "service": "dashboard@internal", "rule": "PathPrefix(`/`)", - "priority": 9223372036854775805 + "priority": 2147483645 } }, "middlewares": { diff --git a/pkg/provider/traefik/fixtures/api_insecure_without_dashboard.json b/pkg/provider/traefik/fixtures/api_insecure_without_dashboard.json index 65b389f81..11c035942 100644 --- a/pkg/provider/traefik/fixtures/api_insecure_without_dashboard.json +++ b/pkg/provider/traefik/fixtures/api_insecure_without_dashboard.json @@ -7,7 +7,7 @@ ], "service": "api@internal", "rule": "PathPrefix(`/api`)", - "priority": 9223372036854775806 + "priority": 2147483646 } }, "services": { diff --git a/pkg/provider/traefik/fixtures/full_configuration.json b/pkg/provider/traefik/fixtures/full_configuration.json index fe00ff139..3544aa39c 100644 --- a/pkg/provider/traefik/fixtures/full_configuration.json +++ b/pkg/provider/traefik/fixtures/full_configuration.json @@ -7,7 +7,7 @@ ], "service": "api@internal", "rule": "PathPrefix(`/api`)", - "priority": 9223372036854775806 + "priority": 2147483646 }, "dashboard": { "entryPoints": [ @@ -19,7 +19,7 @@ ], "service": "dashboard@internal", "rule": "PathPrefix(`/`)", - "priority": 9223372036854775805 + "priority": 2147483645 }, "ping": { "entryPoints": [ @@ -27,7 +27,7 @@ ], "service": "ping@internal", "rule": "PathPrefix(`/ping`)", - "priority": 9223372036854775807 + "priority": 2147483647 }, "prometheus": { "entryPoints": [ @@ -35,7 +35,7 @@ ], "service": "prometheus@internal", "rule": "PathPrefix(`/metrics`)", - "priority": 9223372036854775807 + "priority": 2147483647 }, "rest": { "entryPoints": [ @@ -43,7 +43,7 @@ ], "service": "rest@internal", "rule": "PathPrefix(`/api/providers`)", - "priority": 9223372036854775807 + "priority": 2147483647 } }, "middlewares": { diff --git a/pkg/provider/traefik/fixtures/ping_simple.json b/pkg/provider/traefik/fixtures/ping_simple.json index 97131f7b3..da48afb34 100644 --- a/pkg/provider/traefik/fixtures/ping_simple.json +++ b/pkg/provider/traefik/fixtures/ping_simple.json @@ -7,7 +7,7 @@ ], "service": "ping@internal", "rule": "PathPrefix(`/ping`)", - "priority": 9223372036854775807 + "priority": 2147483647 } }, "services": { diff --git a/pkg/provider/traefik/fixtures/prometheus_simple.json b/pkg/provider/traefik/fixtures/prometheus_simple.json index 8ed85e11f..9699120b1 100644 --- a/pkg/provider/traefik/fixtures/prometheus_simple.json +++ b/pkg/provider/traefik/fixtures/prometheus_simple.json @@ -7,7 +7,7 @@ ], "service": "prometheus@internal", "rule": "PathPrefix(`/metrics`)", - "priority": 9223372036854775807 + "priority": 2147483647 } }, "services": { diff --git a/pkg/provider/traefik/fixtures/rest_insecure.json b/pkg/provider/traefik/fixtures/rest_insecure.json index dd9722583..d37115cc3 100644 --- a/pkg/provider/traefik/fixtures/rest_insecure.json +++ b/pkg/provider/traefik/fixtures/rest_insecure.json @@ -7,7 +7,7 @@ ], "service": "rest@internal", "rule": "PathPrefix(`/api/providers`)", - "priority": 9223372036854775807 + "priority": 2147483647 } }, "services": { diff --git a/pkg/provider/traefik/internal.go b/pkg/provider/traefik/internal.go index a4eebbebd..1ee282cee 100644 --- a/pkg/provider/traefik/internal.go +++ b/pkg/provider/traefik/internal.go @@ -71,7 +71,7 @@ func (i *Provider) apiConfiguration(cfg *dynamic.Configuration) { cfg.HTTP.Routers["api"] = &dynamic.Router{ EntryPoints: []string{"traefik"}, Service: "api@internal", - Priority: math.MaxInt64 - 1, + Priority: math.MaxInt32 - 1, Rule: "PathPrefix(`/api`)", } @@ -79,7 +79,7 @@ func (i *Provider) apiConfiguration(cfg *dynamic.Configuration) { cfg.HTTP.Routers["dashboard"] = &dynamic.Router{ EntryPoints: []string{"traefik"}, Service: "dashboard@internal", - Priority: math.MaxInt64 - 2, + Priority: math.MaxInt32 - 2, Rule: "PathPrefix(`/`)", Middlewares: []string{"dashboard_redirect@internal", "dashboard_stripprefix@internal"}, } @@ -113,7 +113,7 @@ func (i *Provider) pingConfiguration(cfg *dynamic.Configuration) { cfg.HTTP.Routers["ping"] = &dynamic.Router{ EntryPoints: []string{i.staticCfg.Ping.EntryPoint}, Service: "ping@internal", - Priority: math.MaxInt64, + Priority: math.MaxInt32, Rule: "PathPrefix(`/ping`)", } } @@ -130,7 +130,7 @@ func (i *Provider) restConfiguration(cfg *dynamic.Configuration) { cfg.HTTP.Routers["rest"] = &dynamic.Router{ EntryPoints: []string{"traefik"}, Service: "rest@internal", - Priority: math.MaxInt64, + Priority: math.MaxInt32, Rule: "PathPrefix(`/api/providers`)", } } @@ -147,7 +147,7 @@ func (i *Provider) prometheusConfiguration(cfg *dynamic.Configuration) { cfg.HTTP.Routers["prometheus"] = &dynamic.Router{ EntryPoints: []string{i.staticCfg.Metrics.Prometheus.EntryPoint}, Service: "prometheus@internal", - Priority: math.MaxInt64, + Priority: math.MaxInt32, Rule: "PathPrefix(`/metrics`)", } }