Fix problems about duplicated and missing Docker backends/frontends.
This commit is contained in:
parent
aae17c817b
commit
6619a787a3
2 changed files with 22 additions and 16 deletions
|
@ -302,9 +302,15 @@ func (p *Provider) loadDockerConfig(containersInspected []dockerData) *types.Con
|
||||||
frontends := map[string][]dockerData{}
|
frontends := map[string][]dockerData{}
|
||||||
backends := map[string]dockerData{}
|
backends := map[string]dockerData{}
|
||||||
servers := map[string][]dockerData{}
|
servers := map[string][]dockerData{}
|
||||||
|
serviceNames := make(map[string]struct{})
|
||||||
for idx, container := range filteredContainers {
|
for idx, container := range filteredContainers {
|
||||||
frontendName := p.getFrontendName(container, idx)
|
if _, exists := serviceNames[container.ServiceName]; !exists {
|
||||||
frontends[frontendName] = append(frontends[frontendName], container)
|
frontendName := p.getFrontendName(container, idx)
|
||||||
|
frontends[frontendName] = append(frontends[frontendName], container)
|
||||||
|
if len(container.ServiceName) > 0 {
|
||||||
|
serviceNames[container.ServiceName] = struct{}{}
|
||||||
|
}
|
||||||
|
}
|
||||||
backendName := p.getBackend(container)
|
backendName := p.getBackend(container)
|
||||||
backends[backendName] = container
|
backends[backendName] = container
|
||||||
servers[backendName] = append(servers[backendName], container)
|
servers[backendName] = append(servers[backendName], container)
|
||||||
|
@ -427,9 +433,9 @@ func (p *Provider) getServicePriority(container dockerData, serviceName string)
|
||||||
// Extract backend from labels for a given service and a given docker container
|
// Extract backend from labels for a given service and a given docker container
|
||||||
func (p *Provider) getServiceBackend(container dockerData, serviceName string) string {
|
func (p *Provider) getServiceBackend(container dockerData, serviceName string) string {
|
||||||
if value, ok := getContainerServiceLabel(container, serviceName, "frontend.backend"); ok {
|
if value, ok := getContainerServiceLabel(container, serviceName, "frontend.backend"); ok {
|
||||||
return value
|
return container.ServiceName + "-" + value
|
||||||
}
|
}
|
||||||
return p.getBackend(container) + "-" + provider.Normalize(serviceName)
|
return strings.TrimPrefix(container.ServiceName, "/") + "-" + p.getBackend(container) + "-" + provider.Normalize(serviceName)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Extract rule from labels for a given service and a given docker container
|
// Extract rule from labels for a given service and a given docker container
|
||||||
|
|
|
@ -171,19 +171,19 @@ func TestDockerGetServiceBackend(t *testing.T) {
|
||||||
}{
|
}{
|
||||||
{
|
{
|
||||||
container: containerJSON(name("foo")),
|
container: containerJSON(name("foo")),
|
||||||
expected: "foo-myservice",
|
expected: "foo-foo-myservice",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
container: containerJSON(labels(map[string]string{
|
container: containerJSON(labels(map[string]string{
|
||||||
types.LabelBackend: "another-backend",
|
types.LabelBackend: "another-backend",
|
||||||
})),
|
})),
|
||||||
expected: "another-backend-myservice",
|
expected: "fake-another-backend-myservice",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
container: containerJSON(labels(map[string]string{
|
container: containerJSON(labels(map[string]string{
|
||||||
"traefik.myservice.frontend.backend": "custom-backend",
|
"traefik.myservice.frontend.backend": "custom-backend",
|
||||||
})),
|
})),
|
||||||
expected: "custom-backend",
|
expected: "fake-custom-backend",
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -341,8 +341,8 @@ func TestDockerLoadDockerServiceConfig(t *testing.T) {
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
expectedFrontends: map[string]*types.Frontend{
|
expectedFrontends: map[string]*types.Frontend{
|
||||||
"frontend-foo-service": {
|
"frontend-foo-foo-service": {
|
||||||
Backend: "backend-foo-service",
|
Backend: "backend-foo-foo-service",
|
||||||
PassHostHeader: true,
|
PassHostHeader: true,
|
||||||
EntryPoints: []string{"http", "https"},
|
EntryPoints: []string{"http", "https"},
|
||||||
BasicAuth: []string{"test:$apr1$H6uskkkW$IgXLP6ewTrSuBkTrqE8wj/", "test2:$apr1$d9hr9HBB$4HxwgUir3HP4EsggP/QNo0"},
|
BasicAuth: []string{"test:$apr1$H6uskkkW$IgXLP6ewTrSuBkTrqE8wj/", "test2:$apr1$d9hr9HBB$4HxwgUir3HP4EsggP/QNo0"},
|
||||||
|
@ -354,7 +354,7 @@ func TestDockerLoadDockerServiceConfig(t *testing.T) {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
expectedBackends: map[string]*types.Backend{
|
expectedBackends: map[string]*types.Backend{
|
||||||
"backend-foo-service": {
|
"backend-foo-foo-service": {
|
||||||
Servers: map[string]types.Server{
|
Servers: map[string]types.Server{
|
||||||
"service-0": {
|
"service-0": {
|
||||||
URL: "http://127.0.0.1:2503",
|
URL: "http://127.0.0.1:2503",
|
||||||
|
@ -399,8 +399,8 @@ func TestDockerLoadDockerServiceConfig(t *testing.T) {
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
expectedFrontends: map[string]*types.Frontend{
|
expectedFrontends: map[string]*types.Frontend{
|
||||||
"frontend-foobar": {
|
"frontend-test1-foobar": {
|
||||||
Backend: "backend-foobar",
|
Backend: "backend-test1-foobar",
|
||||||
PassHostHeader: false,
|
PassHostHeader: false,
|
||||||
Priority: 5000,
|
Priority: 5000,
|
||||||
EntryPoints: []string{"http", "https", "ws"},
|
EntryPoints: []string{"http", "https", "ws"},
|
||||||
|
@ -411,8 +411,8 @@ func TestDockerLoadDockerServiceConfig(t *testing.T) {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
"frontend-test2-anotherservice": {
|
"frontend-test2-test2-anotherservice": {
|
||||||
Backend: "backend-test2-anotherservice",
|
Backend: "backend-test2-test2-anotherservice",
|
||||||
PassHostHeader: true,
|
PassHostHeader: true,
|
||||||
EntryPoints: []string{},
|
EntryPoints: []string{},
|
||||||
BasicAuth: []string{},
|
BasicAuth: []string{},
|
||||||
|
@ -424,7 +424,7 @@ func TestDockerLoadDockerServiceConfig(t *testing.T) {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
expectedBackends: map[string]*types.Backend{
|
expectedBackends: map[string]*types.Backend{
|
||||||
"backend-foobar": {
|
"backend-test1-foobar": {
|
||||||
Servers: map[string]types.Server{
|
Servers: map[string]types.Server{
|
||||||
"service-0": {
|
"service-0": {
|
||||||
URL: "https://127.0.0.1:2503",
|
URL: "https://127.0.0.1:2503",
|
||||||
|
@ -433,7 +433,7 @@ func TestDockerLoadDockerServiceConfig(t *testing.T) {
|
||||||
},
|
},
|
||||||
CircuitBreaker: nil,
|
CircuitBreaker: nil,
|
||||||
},
|
},
|
||||||
"backend-test2-anotherservice": {
|
"backend-test2-test2-anotherservice": {
|
||||||
Servers: map[string]types.Server{
|
Servers: map[string]types.Server{
|
||||||
"service-0": {
|
"service-0": {
|
||||||
URL: "http://127.0.0.1:8079",
|
URL: "http://127.0.0.1:8079",
|
||||||
|
|
Loading…
Reference in a new issue