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

Described all router environment variables #3090

Merged

Conversation

knobunc
Copy link
Contributor

@knobunc knobunc commented Oct 21, 2016

Added missing router environment variables to the documentation, and
added descriptons to all of them.

For 3.3 and 3.4.

@knobunc
Copy link
Contributor Author

knobunc commented Oct 21, 2016

@JacobTanenbaum @ramr PTAL

@knobunc knobunc force-pushed the feature/desribe-all-router-env branch 4 times, most recently from d75018f to fff15b9 Compare October 21, 2016 13:56
|`*ROUTER_SLOWLORIS_TIMEOUT*` | 10s
|Variable | Default | Description
|`*ROUTER_SERVICE_HTTP_PORT*` | 80 | What port to listen for http requests on
|`*ROUTER_SERVICE_HTTPS_PORT*` | 443 | What port to listen for http requests on

Choose a reason for hiding this comment

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

should this be "What port to listen for https requests on"?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It should!

@knobunc knobunc force-pushed the feature/desribe-all-router-env branch from fff15b9 to 0180a61 Compare October 21, 2016 19:24
@JacobTanenbaum
Copy link

LGTM

@knobunc
Copy link
Contributor Author

knobunc commented Oct 21, 2016

@adellape PTAL

|`*ROUTER_LOG_LEVEL*` | warning | What log level to send to the above address
|`*ROUTER_BACKEND_CHECK_INTERVAL*` | 5000ms | How frequently to check backends for "liveness"
|`*ROUTER_DEFAULT_CONNECT_TIMEOUT*`| 5s | The maximum connect time
|`*ROUTER_DEFAULT_CLIENT_TIMEOUT*`| 30s |How long a client has to acknowledge or send data
Copy link

Choose a reason for hiding this comment

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

Minor nit space between '|' and 'How'.

|`*ROUTER_BACKEND_CHECK_INTERVAL*` | 5000ms | How frequently to check backends for "liveness"
|`*ROUTER_DEFAULT_CONNECT_TIMEOUT*`| 5s | The maximum connect time
|`*ROUTER_DEFAULT_CLIENT_TIMEOUT*`| 30s |How long a client has to acknowledge or send data
|`*ROUTER_DEFAULT_SERVER_TIMEOUT*`| 30s |How long a server has to acknowledge or send data
Copy link

Choose a reason for hiding this comment

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

Same as above: Minor nit space between '|' and 'How'.

@ramr
Copy link

ramr commented Oct 24, 2016

@knobunc this LGTM - minor nits and there's a few others if you want to add 'em here or in another PR:

STATS_PORT: If the underlying router implementation can provide statistics this is a hint to expose it on this port.  
STATS_PASSWORD: If the underlying router implementation can provide statistics this is the requested password for auth.  
STATS_USERNAME: If the underlying router implementation can provide statistics this is the requested username for auth.  

ROUTER_SUBDOMAIN: If specified, a template that should be used to generate the hostname for a route without spec.host (e.g. '${name}-${namespace}.myapps.mycompany.com')  
ROUTER_OVERRIDE_HOSTNAME: Override the spec.host value for a route with --hostname-template   

ROUTE_LABELS:  A label selector to apply to the routes to watch  
ROUTE_FIELDS: A field selector to apply to routes to watch  
PROJECT_LABELS:  A label selector to apply to projects to watch; if '*' watches all projects the client can access  
NAMESPACE_LABELS: A label selector to apply to namespaces to watch  

EXTENDED_VALIDATION: If set, then an additional extended validation step is performed on all routes admitted in by this router. Defaults to true and enables the extended validation checks.  

Thx

@knobunc knobunc force-pushed the feature/desribe-all-router-env branch 2 times, most recently from 300aecb to bb9d691 Compare October 25, 2016 14:46
@knobunc
Copy link
Contributor Author

knobunc commented Oct 25, 2016

@ramr Updated per your suggestion. Thanks

@ramr
Copy link

ramr commented Oct 26, 2016

LGTM

@knobunc knobunc force-pushed the feature/desribe-all-router-env branch from bb9d691 to 1ee0697 Compare October 28, 2016 13:56
@zhaozhanqi
Copy link

Could you also help add the following which I knowed:
oc env dc/router TEMPLATE_FILE=/var/lib/haproxy/conf/custom/haproxy-config-custom.template
oc env dc/router RELOAD_INTERVAL=12s

@knobunc
Copy link
Contributor Author

knobunc commented Nov 2, 2016

@zhaozhanqi thanks for the suggestion. By looking for those I found more to add as well.

@knobunc
Copy link
Contributor Author

knobunc commented Nov 16, 2016

@openshift/team-documentation this is ready to merge.

@vikram-redhat
Copy link
Contributor

@gaurav-nelson - PTAL and if no issues, please merge.

|`*ROUTER_ENABLE_COMPRESSION*`| false | If "true", compress responses when possible.
|`*ROUTER_LOG_LEVEL*` | warning | What log level to send to the above address.
|`*ROUTER_OVERRIDE_HOSTNAME*`| | If set, override the spec.host value for a route with the template in ROUTER_SUBDOMAIN.
|`*ROUTER_SERVICE_HTTPS_PORT*` | 443 | What port to listen for https requests on.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggestion: Please change "What port to listen for https requests on." to "Port to listen for https requests." OR "Port on which to listen for https requests."

|`*ROUTER_LOG_LEVEL*` | warning | What log level to send to the above address.
|`*ROUTER_OVERRIDE_HOSTNAME*`| | If set, override the spec.host value for a route with the template in ROUTER_SUBDOMAIN.
|`*ROUTER_SERVICE_HTTPS_PORT*` | 443 | What port to listen for https requests on.
|`*ROUTER_SERVICE_HTTP_PORT*` | 80 | What port to listen for http requests on.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggestion: Please change "What port to listen for http requests on." to "Port to listen for http requests." OR "Port on which to listen for http requests."

|`*ROUTER_OVERRIDE_HOSTNAME*`| | If set, override the spec.host value for a route with the template in ROUTER_SUBDOMAIN.
|`*ROUTER_SERVICE_HTTPS_PORT*` | 443 | What port to listen for https requests on.
|`*ROUTER_SERVICE_HTTP_PORT*` | 80 | What port to listen for http requests on.
|`*ROUTER_SERVICE_NAME*` | public | The name the router will identify itself with in route statuses.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggestion: Please change "The name the router will identify itself with in route statuses." to "The name that router will identify itself with in route statuses."

@gaurav-nelson
Copy link
Contributor

Everything looks good. I will do a merge and then update the language changes I suggested.

@knobunc
Copy link
Contributor Author

knobunc commented Nov 17, 2016

Thank you @gaurav-nelson. Your suggestions look good.

If this can go in 3.4 and 3.3 that would be nice, but really getting it in 3.4 alone is sufficient.

@adellape
Copy link
Contributor

@knobunc Can you also squash down to 1 commit? Will leave the merging to @gaurav-nelson though here.

@knobunc knobunc force-pushed the feature/desribe-all-router-env branch from b2f23cb to 9c10e1b Compare November 17, 2016 16:31
Added missing router environment variables to the documentation, and
added descriptons to all of them.

For 3.4 only.
@knobunc knobunc force-pushed the feature/desribe-all-router-env branch from 9c10e1b to 66a6d22 Compare November 17, 2016 16:36
@knobunc
Copy link
Contributor Author

knobunc commented Nov 17, 2016

Squashed and addressed @gaurav-nelson's comments.

@gaurav-nelson
Copy link
Contributor

Follow up is now in PR #3251 (#3251)

@gaurav-nelson
Copy link
Contributor

@knobunc Can you please confirm that all these options available in 3.3 now? Before it gets released this Monday. Thanks.

@knobunc
Copy link
Contributor Author

knobunc commented Nov 18, 2016

@gaurav-nelson thank you for checking. I just ran through them all and there are two that are not:

  • ROUTER_ENABLE_COMPRESSION
  • ROUTER_COMPRESSION_MIME

This was referenced Nov 21, 2016
@adellape adellape modified the milestones: Next Release, Staging Nov 21, 2016
@bfallonf bfallonf modified the milestones: Staging, Published - 21/11/2016 Nov 28, 2016
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.

8 participants