Fix Docker & KV templates for sticky
Signed-off-by: Emile Vauge <emile@vauge.com>
This commit is contained in:
parent
291c3b6dbc
commit
462d8b3e74
8 changed files with 59 additions and 147 deletions
|
@ -262,19 +262,27 @@ func (provider *Docker) loadDockerConfig(containersInspected []dockerData) *type
|
|||
}, containersInspected).([]dockerData)
|
||||
|
||||
frontends := map[string][]dockerData{}
|
||||
backends := map[string]dockerData{}
|
||||
servers := map[string][]dockerData{}
|
||||
for _, container := range filteredContainers {
|
||||
frontendName := provider.getFrontendName(container)
|
||||
frontends[frontendName] = append(frontends[frontendName], container)
|
||||
frontends[frontendName] = append(frontends[frontendName], container)
|
||||
backendName := provider.getBackend(container)
|
||||
backends[backendName] = container
|
||||
servers[backendName] = append(servers[backendName], container)
|
||||
}
|
||||
|
||||
templateObjects := struct {
|
||||
Containers []dockerData
|
||||
Frontends map[string][]dockerData
|
||||
Backends map[string]dockerData
|
||||
Servers map[string][]dockerData
|
||||
Domain string
|
||||
}{
|
||||
filteredContainers,
|
||||
frontends,
|
||||
backends,
|
||||
servers,
|
||||
provider.Domain,
|
||||
}
|
||||
|
||||
|
|
|
@ -940,7 +940,6 @@ func TestDockerLoadDockerConfig(t *testing.T) {
|
|||
},
|
||||
},
|
||||
CircuitBreaker: nil,
|
||||
LoadBalancer: &types.LoadBalancer{Sticky: false, Method: ""},
|
||||
},
|
||||
},
|
||||
},
|
||||
|
@ -1027,7 +1026,6 @@ func TestDockerLoadDockerConfig(t *testing.T) {
|
|||
},
|
||||
},
|
||||
CircuitBreaker: nil,
|
||||
LoadBalancer: &types.LoadBalancer{Sticky: false, Method: ""},
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
|
@ -107,7 +107,6 @@ func TestMarathonLoadConfig(t *testing.T) {
|
|||
},
|
||||
},
|
||||
CircuitBreaker: nil,
|
||||
LoadBalancer: &types.LoadBalancer{Sticky: false},
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue