homelab/traefik
1
0
Fork 0
Code Activity

Adds Marathon support.

Browse source 
Co-authored-by: Julien Salleyron <julien@containo.us>
This commit is contained in:
Ludovic Fernandez 2019-01-29 17:54:05 +01:00 • committed by Traefiker Bot
parent a433e469cc
commit 246b245959
22 changed files with 2223 additions and 2203 deletions
Download patch file Download diff file Expand all files Collapse all files

6
integration/integration_test.go
View file

@ -43,12 +43,8 @@ func init() {
// check.Suite(&ConsulSuite{})
// check.Suite(&DynamoDBSuite{})
// check.Suite(&EurekaSuite{})
// check.Suite(&MarathonSuite{})
// check.Suite(&MarathonSuite15{})
// check.Suite(&MesosSuite{})
// FIXME use docker
// FIXME use consulcatalog
// check.Suite(&ConstraintSuite{})
@ -64,6 +60,8 @@ func init() {
check.Suite(&HostResolverSuite{})
check.Suite(&HTTPSSuite{})
check.Suite(&LogRotationSuite{})
check.Suite(&MarathonSuite{})
check.Suite(&MarathonSuite15{})
check.Suite(&RateLimitSuite{})
check.Suite(&RestSuite{})
check.Suite(&RetrySuite{})

5
integration/marathon15_test.go
View file

@ -7,7 +7,6 @@ import (
"time"
"github.com/containous/traefik/integration/try"
"github.com/containous/traefik/old/provider/label"
"github.com/gambol99/go-marathon"
"github.com/go-check/check"
checker "github.com/vdemeester/shakers"
@ -98,7 +97,7 @@ func (s *MarathonSuite15) TestConfigurationUpdate(c *check.C) {
CPU(0.1).
Memory(32).
EmptyNetworks().
AddLabel(label.TraefikFrontendRule, "PathPrefix:/service")
AddLabel("traefik.Routers.rt.Rule", "PathPrefix:/service")
app.Container.
Expose(80).
Docker.
@ -118,7 +117,7 @@ func (s *MarathonSuite15) TestConfigurationUpdate(c *check.C) {
CPU(0.1).
Memory(32).
EmptyNetworks().
AddLabel(label.Prefix+"app"+label.TraefikFrontendRule, "PathPrefix:/app")
AddLabel("traefik.Routers.app.Rule", "PathPrefix:/app")
app.Container.
Expose(80).
Docker.

5
integration/marathon_test.go
View file

@ -7,7 +7,6 @@ import (
"time"
"github.com/containous/traefik/integration/try"
"github.com/containous/traefik/old/provider/label"
"github.com/gambol99/go-marathon"
"github.com/go-check/check"
checker "github.com/vdemeester/shakers"
@ -109,7 +108,7 @@ func (s *MarathonSuite) TestConfigurationUpdate(c *check.C) {
Name("/whoami").
CPU(0.1).
Memory(32).
AddLabel(label.TraefikFrontendRule, "PathPrefix:/service")
AddLabel("traefik.Routers.rt.Rule", "PathPrefix:/service")
app.Container.Docker.Bridged().
Expose(80).
Container("containous/whoami")
@ -126,7 +125,7 @@ func (s *MarathonSuite) TestConfigurationUpdate(c *check.C) {
Name("/whoami").
CPU(0.1).
Memory(32).
AddLabel(label.Prefix+"app"+label.TraefikFrontendRule, "PathPrefix:/app")
AddLabel("traefik.Routers.app.Rule", "PathPrefix:/app")
app.Container.Docker.Bridged().
Expose(80).
Container("containous/whoami")