Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Empty Rancher Service Labels. #1654

Merged
merged 1 commit into from May 24, 2017

Conversation

ldez
Copy link
Member

@ldez ldez commented May 23, 2017

Description

Fixes #1615

@ldez ldez added this to the 1.3 milestone May 23, 2017
@ldez ldez requested a review from SantoDE May 23, 2017 13:57
@ldez ldez force-pushed the fix-rancher-missing-launch-config branch from 7314a48 to 3aa4e47 Compare May 23, 2017 13:58
@ldez ldez requested a review from emilevauge May 23, 2017 14:00
@ldez ldez changed the title fix: Empty Rancher launch config. fix: Empty Rancher Service Labels. May 23, 2017
@ldez ldez changed the base branch from master to v1.3 May 23, 2017 14:08
@ldez ldez force-pushed the fix-rancher-missing-launch-config branch from 07fcf70 to 9884728 Compare May 23, 2017 14:08
for key, value := range service.LaunchConfig.Labels {
rancherData.Labels[key] = value.(string)
if service.LaunchConfig == nil || service.LaunchConfig.Labels == nil {
log.Warnf("Rancher Service Labels are missing.")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We may add service.Name in the log

@ldez ldez force-pushed the fix-rancher-missing-launch-config branch from 9884728 to 5f9041b Compare May 23, 2017 19:29
Copy link
Member

@emilevauge emilevauge left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks @ldez

Copy link
Collaborator

@SantoDE SantoDE left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👼

Thanks @ldez. Needs a rebase now ;)

@ldez ldez force-pushed the fix-rancher-missing-launch-config branch from 5f9041b to 3ff9dfd Compare May 24, 2017 08:56
@ldez ldez merged commit 5b896bb into traefik:v1.3 May 24, 2017
@ldez ldez deleted the fix-rancher-missing-launch-config branch May 24, 2017 09:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants