Merge branch 'v1.6' into master
This commit is contained in:
commit
4eda1e1bd4
50 changed files with 763 additions and 650 deletions
|
@ -150,7 +150,7 @@ func getBackendName(service rancherData) string {
|
|||
}
|
||||
|
||||
func getSegmentBackendName(service rancherData) string {
|
||||
if value := label.GetStringValue(service.SegmentLabels, label.TraefikFrontendBackend, ""); len(value) > 0 {
|
||||
if value := label.GetStringValue(service.SegmentLabels, label.TraefikBackend, ""); len(value) > 0 {
|
||||
return provider.Normalize(service.Name + "-" + value)
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue