homelab/traefik
1
0
Fork 0
Code Activity

Merge branch 'v2.1' into master

Browse source
This commit is contained in:
Fernandez Ludovic 2019-12-03 10:43:25 +01:00
commit 829649e905
73 changed files with 1497 additions and 517 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pkg/provider/rancher/config.go
View file

@ -121,7 +121,7 @@ func (p *Provider) keepService(ctx context.Context, service rancherData) bool {
return false
}
matches, err := constraints.Match(service.Labels, p.Constraints)
matches, err := constraints.MatchLabels(service.Labels, p.Constraints)
if err != nil {
logger.Errorf("Error matching constraints expression: %v", err)
return false

2
pkg/provider/rancher/rancher.go
View file

@ -193,7 +193,7 @@ func (p *Provider) parseMetadataSourcedRancherData(ctx context.Context, stacks [
}
service := rancherData{
Name: service.Name + "/" + stack.Name,
Name: service.Name + "_" + stack.Name,
State: service.State,
Labels: service.Labels,
Port: servicePort,