Rename traefik.docker.* labels for Docker Swarm to traefik.swarm.*
This commit is contained in:
parent
f547f1b22b
commit
514914639a
10 changed files with 152 additions and 93 deletions
|
@ -65,7 +65,9 @@ func TestListTasks(t *testing.T) {
|
|||
t.Run(strconv.Itoa(caseID), func(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
p := SwarmProvider{}
|
||||
var p SwarmProvider
|
||||
require.NoError(t, p.Init())
|
||||
|
||||
dockerData, err := p.parseService(context.Background(), test.service, test.networks)
|
||||
require.NoError(t, err)
|
||||
|
||||
|
@ -100,8 +102,8 @@ func TestSwarmProvider_listServices(t *testing.T) {
|
|||
swarmService(
|
||||
serviceName("service1"),
|
||||
serviceLabels(map[string]string{
|
||||
"traefik.docker.network": "barnet",
|
||||
"traefik.docker.LBSwarm": "true",
|
||||
"traefik.swarm.network": "barnet",
|
||||
"traefik.swarm.LBSwarm": "true",
|
||||
}),
|
||||
withEndpointSpec(modeVIP),
|
||||
withEndpoint(
|
||||
|
@ -111,8 +113,8 @@ func TestSwarmProvider_listServices(t *testing.T) {
|
|||
swarmService(
|
||||
serviceName("service2"),
|
||||
serviceLabels(map[string]string{
|
||||
"traefik.docker.network": "barnet",
|
||||
"traefik.docker.LBSwarm": "true",
|
||||
"traefik.swarm.network": "barnet",
|
||||
"traefik.swarm.LBSwarm": "true",
|
||||
}),
|
||||
withEndpointSpec(modeDNSRR)),
|
||||
},
|
||||
|
@ -126,8 +128,8 @@ func TestSwarmProvider_listServices(t *testing.T) {
|
|||
swarmService(
|
||||
serviceName("service1"),
|
||||
serviceLabels(map[string]string{
|
||||
"traefik.docker.network": "barnet",
|
||||
"traefik.docker.LBSwarm": "true",
|
||||
"traefik.swarm.network": "barnet",
|
||||
"traefik.swarm.LBSwarm": "true",
|
||||
}),
|
||||
withEndpointSpec(modeVIP),
|
||||
withEndpoint(
|
||||
|
@ -137,8 +139,8 @@ func TestSwarmProvider_listServices(t *testing.T) {
|
|||
swarmService(
|
||||
serviceName("service2"),
|
||||
serviceLabels(map[string]string{
|
||||
"traefik.docker.network": "barnet",
|
||||
"traefik.docker.LBSwarm": "true",
|
||||
"traefik.swarm.network": "barnet",
|
||||
"traefik.swarm.LBSwarm": "true",
|
||||
}),
|
||||
withEndpointSpec(modeDNSRR)),
|
||||
},
|
||||
|
@ -173,7 +175,7 @@ func TestSwarmProvider_listServices(t *testing.T) {
|
|||
swarmService(
|
||||
serviceName("service1"),
|
||||
serviceLabels(map[string]string{
|
||||
"traefik.docker.network": "barnet",
|
||||
"traefik.swarm.network": "barnet",
|
||||
}),
|
||||
withEndpointSpec(modeVIP),
|
||||
withEndpoint(
|
||||
|
@ -183,7 +185,7 @@ func TestSwarmProvider_listServices(t *testing.T) {
|
|||
swarmService(
|
||||
serviceName("service2"),
|
||||
serviceLabels(map[string]string{
|
||||
"traefik.docker.network": "barnet",
|
||||
"traefik.swarm.network": "barnet",
|
||||
}),
|
||||
withEndpointSpec(modeDNSRR)),
|
||||
},
|
||||
|
@ -233,7 +235,8 @@ func TestSwarmProvider_listServices(t *testing.T) {
|
|||
|
||||
dockerClient := &fakeServicesClient{services: test.services, tasks: test.tasks, dockerVersion: test.dockerVersion, networks: test.networks}
|
||||
|
||||
p := SwarmProvider{}
|
||||
var p SwarmProvider
|
||||
require.NoError(t, p.Init())
|
||||
|
||||
serviceDockerData, err := p.listServices(context.Background(), dockerClient)
|
||||
assert.NoError(t, err)
|
||||
|
@ -351,7 +354,8 @@ func TestSwarmProvider_parseService_task(t *testing.T) {
|
|||
t.Run(strconv.Itoa(caseID), func(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
p := SwarmProvider{}
|
||||
var p SwarmProvider
|
||||
require.NoError(t, p.Init())
|
||||
|
||||
dData, err := p.parseService(context.Background(), test.service, test.networks)
|
||||
require.NoError(t, err)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue