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

allow roundrobin algorithm as a choice in passthrough/reencrypt #9710

Merged
merged 1 commit into from
Jul 7, 2016

Conversation

rajatchopra
Copy link
Contributor

For the passthrough and reencrypt routes, the choice of balancing algorithm was not provided through annotations. Making that possible with this PR. Weights depend on the fact that the balancing algorithm be 'roundrobin'.

@rajatchopra
Copy link
Contributor Author

[test]

@rajatchopra
Copy link
Contributor Author

@openshift/networking @ramr @knobunc
Review please.

@ramr
Copy link
Contributor

ramr commented Jul 6, 2016

LGTM maybe add source to the white-list as well since we do use it + might make sense for tcp connections.

@@ -252,7 +252,13 @@ backend be_tcp_{{$cfgIdx}}
{{ if ne (env "ROUTER_SYSLOG_ADDRESS" "") ""}}
option tcplog
{{ end }}
{{ with $balanceAlgo := index $cfg.Annotations "router.openshift.io/haproxy.balance" }}
{{ with $matchValue := (matchValues $balanceAlgo "roundrobin" "leastconn" ) }}
balance {{ $balanceAlgo }}
Copy link
Member

Choose a reason for hiding this comment

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

I'm just template ignorant. What value does https://github.com/openshift/origin/pull/9710/files#diff-dc1a3cefa4a5177a9bfd475c81220cf1R256 bring? Does it cause the entire template processing to fail if the match fails?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No, the template processing does not fail. It just means that the 'with' block will not be processed further. Treat that as an 'if' statement.

@rajatchopra
Copy link
Contributor Author

[test] again

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to c94ec71

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/5859/)

@rajatchopra
Copy link
Contributor Author

@eparis / @openshift/networking
Merge ready?

@eparis
Copy link
Member

eparis commented Jul 6, 2016

[merge]

@openshift-bot
Copy link
Contributor

openshift-bot commented Jul 6, 2016

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/5866/) (Image: devenv-rhel7_4540)

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to c94ec71

@openshift-bot openshift-bot merged commit a295b01 into openshift:master Jul 7, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants