Merge branch 'v2.0' into v2.1

2019-12-02 18:20:29 +01:00
parent 4cb9eec257 ecd51a1428
commit 89919dbe36
52 changed files with 677 additions and 336 deletions
--- a/pkg/provider/rancher/rancher.go
+++ b/pkg/provider/rancher/rancher.go
@@ -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,