Normalize serviceName added to the service backend names #2631
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mmatur
added
status/2-needs-review
kind/bug/fix
ldez
suggested changes
Dec 29, 2017
provider/docker/docker.go
Outdated
| @@ -433,9 +433,9 @@ func (p *Provider) getServicePriority(container dockerData, serviceName string) | |||
| // Extract backend from labels for a given service and a given docker container | |||
| func (p *Provider) getServiceBackend(container dockerData, serviceName string) string { | |||
| if value, ok := getContainerServiceLabel(container, serviceName, "frontend.backend"); ok { | |||
| return container.ServiceName + "-" + value | |||
| return provider.Normalize(container.ServiceName) + "-" + value | |||
There was a problem hiding this comment.
provider.Normalize(container.ServiceName + "-" + value)
provider/docker/docker.go
Outdated
| } | ||
| return strings.TrimPrefix(container.ServiceName, "/") + "-" + p.getBackend(container) + "-" + provider.Normalize(serviceName) | ||
| return strings.TrimPrefix(provider.Normalize(container.ServiceName), "/") + "-" + p.getBackend(container) + "-" + provider.Normalize(serviceName) |
There was a problem hiding this comment.
provider.Normalize(container.ServiceName + "-" + p.getBackend(container) + "-" + serviceName)
mmatur
force-pushed
the
fix/docker-backend-name
branch
from
120ed1b
to
0be4ab0
Compare
ldez
suggested changes
Dec 30, 2017
provider/docker/docker.go
Outdated
| } | ||
| return strings.TrimPrefix(container.ServiceName, "/") + "-" + p.getBackend(container) + "-" + provider.Normalize(serviceName) | ||
| return provider.Normalize(strings.TrimPrefix(container.ServiceName, "/") + "-" + p.getBackend(container) + "-" + serviceName) |
There was a problem hiding this comment.
provider.Normalize(container.ServiceName + "-" + p.getBackend(container) + "-" + serviceName)
traefiker
force-pushed
the
fix/docker-backend-name
branch
from
426da49
to
7b2a81d
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
This PR fix:
Motivation
Fixes: #2630
More