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

consul/kv.tmpl: weight default value should be a int #826

Merged
merged 3 commits into from
Nov 23, 2016
Merged

consul/kv.tmpl: weight default value should be a int #826

merged 3 commits into from
Nov 23, 2016

Conversation

klausenbusk
Copy link
Contributor

@klausenbusk klausenbusk commented Nov 10, 2016

Fix #821

Use 0 as default weight in all backends

Note: Not tested..

@klausenbusk
Copy link
Contributor Author

Forgot to update some tests.. kv_test.go, kubernetes_test.go and docker_test.go I think..

@SantoDE
Copy link
Collaborator

SantoDE commented Nov 13, 2016

Hey @klausenbusk,

thanks a lot for your contribution :-)

Before we can move any further, a rebase is needed.

Thanks a lot!

@klausenbusk
Copy link
Contributor Author

Rebase done.

@emilevauge emilevauge added this to the 1.1 milestone Nov 14, 2016
@SantoDE
Copy link
Collaborator

SantoDE commented Nov 14, 2016

And another one please :( @klausenbusk

@klausenbusk
Copy link
Contributor Author

Hmm, I clicked the update branch button, which merged the last "v1.1".
Is that okay? or you want a "proper" rebase?

@SantoDE
Copy link
Collaborator

SantoDE commented Nov 14, 2016

Please rebase your branch "properly" so that's it's only 1 commit (without the merge stuff ;)). It would just blow our history :) Thanks @klausenbusk

@klausenbusk
Copy link
Contributor Author

Why can't Github do that :)
I need to get home first then ~ 2 hours..

@klausenbusk
Copy link
Contributor Author

Done I also changed the kv_test.go to use weight 0. Not that it matters.

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

@emilevauge
Copy link
Member

Ping @containous/traefik

@SantoDE
Copy link
Collaborator

SantoDE commented Nov 23, 2016

Needs a rebase to be just one Commit I guess?

Besides LGTM

@emilevauge emilevauge merged commit a8cb905 into traefik:v1.1 Nov 23, 2016
@@ -261,7 +261,7 @@ func (provider *Kubernetes) loadIngresses(k8sClient k8s.Client) (*types.Configur
log.Warnf("Endpoints not found for %s/%s, falling back to Service ClusterIP", service.ObjectMeta.Namespace, service.ObjectMeta.Name)
templateObjects.Backends[r.Host+pa.Path].Servers[string(service.UID)] = types.Server{
URL: protocol + "://" + service.Spec.ClusterIP + ":" + strconv.Itoa(port.Port),
Weight: 1,
Weight: 0,
Copy link
Contributor

Choose a reason for hiding this comment

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

Not sure about this change... I don't think we need this since k8s does not add servers to the backend until they are ready...

emilevauge pushed a commit that referenced this pull request Dec 5, 2016
* consul/kv.tmpl: weight default value should be a int

Fix #821

* Use 0 as default weight in all backends
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.

5 participants