Commit graph

174 commits

Author SHA1 Message Date
Manuel de Brito Fontes
d5d958a332 Avoid setting maximum number of open file descriptors lower than 1024 2017-06-12 16:20:40 -04:00
Manuel de Brito Fontes
748f686eca Update nginx interface 2017-06-11 15:56:40 -04:00
Cory Klein
fa70e5e905 Make log format json escaping configurable
This will allow json logging in nginx ingress controllers which greatly
improves ease of log indexing and searching via elasticsearch.

After this change is made, users could set the following property in the
ingress configmap to enable json logging:

log-format-upstream: '{"proxy_protocol_addr": "$proxy_protocol_addr", "proxy_add_x_forwarded_for": "$proxy_add_x_forwarded_for", "remote_user": "$remote_user", "time_iso8601": "$time_iso8601", "request": "$request", "status": "$status", "body_bytes_sent": "$body_bytes_sent", "http_referer": "$http_referer", "http_user_agent": "$http_user_agent", "request_length": "$request_length", "request_time": "$request_time", "proxy_upstream_name": "$proxy_upstream_name", "upstream_addr": "$upstream_addr", "upstream_response_length": "$upstream_response_length", "upstream_response_time": "$upstream_response_time", "upstream_status": "$upstream_status"}'
2017-06-09 15:32:11 -06:00
Manuel Alejandro de Brito Fontes
dbb12afbb9 Merge pull request #829 from rlguarino/ross/2017-06-08T18-48-35-07-00
feat(template): wrap IPv6 addresses in []
2017-06-09 13:21:30 -04:00
Ross Guarino
54f6729dc8 feat(template): wrap IPv6 addresses in []
Add formatIP helper function which will wrap IPv6 addresses
in [] and print IPv4 addresses as is.

Closes #828
2017-06-08 20:11:00 -07:00
Manuel de Brito Fontes
b70e9ca078 Fix dynamic variable name 2017-06-02 11:12:02 -04:00
Manuel Alejandro de Brito Fontes
32f24380ec Merge pull request #787 from aledbf/pass-server-header
Add setting to allow returning the Server header from the backend
2017-05-28 19:16:58 -04:00
Manuel de Brito Fontes
2f20c6bfcb Add setting to allow returning the Server header from the backend 2017-05-28 17:40:25 -04:00
Manuel de Brito Fontes
8837cf93e2 Allow customization of variables hash tables 2017-05-28 16:05:49 -04:00
Manuel de Brito Fontes
20e99fa409 Update sniff parser to fix index out of bound error 2017-05-26 14:25:06 -04:00
Joao Morais
37f8c8bb40 Add ConfigureFlags() on controller interface 2017-05-24 21:03:52 -03:00
Manuel de Brito Fontes
4d7a280371 Fix server name hash maxSize default value 2017-05-23 20:13:32 -04:00
Manuel Alejandro de Brito Fontes
49e490e5e5 Merge pull request #704 from ckeyer/fix_nginx_reload
fix nginx reload flags '-c'
2017-05-17 07:44:54 -04:00
Manuel Alejandro de Brito Fontes
b4032f0648 Merge pull request #722 from aledbf/remove-go-reaper
Remove go-reap and use tini as process reaper
2017-05-17 07:37:23 -04:00
Chuanjian Wang
9f32b74fea
fix nginx reload flags '-c' 2017-05-17 18:30:19 +08:00
Vlad Gorodetsky
3bd2cb331f Add keepalive_requests and client_boxy_buffer_size options 2017-05-17 09:36:10 +03:00
Manuel de Brito Fontes
22d63d0ad0 Auto stash before merge of "master" and "master/master"
Remove go-reap and use tini as process reaper
2017-05-16 16:06:33 -04:00
Manuel de Brito Fontes
a537d2d0fa Remove secrets from ingress after a Delete event 2017-05-11 22:19:16 -03:00
Manuel de Brito Fontes
4bd4bf3be6 Fix remote address in log when protocol is https 2017-05-11 15:04:19 -03:00
David Pratt
d56d8b7da1 Use proxy-protocol to pass through source IP to nginx 2017-05-10 16:22:48 -05:00
Manuel Alejandro de Brito Fontes
317f222527 Merge pull request #679 from ckeyer/template_getenv
add getenv
2017-05-10 08:50:11 -03:00
Chuanjian Wang
87b05847bf
add template function getenv
Signed-off-by: Chuanjian Wang <me@ckeyer.net>
2017-05-10 14:35:42 +08:00
Donald Guy
2d1b6dc9c9 [nginx] pass non-SNI TLS hello to default backend, Fixes #693 2017-05-08 17:44:43 -04:00
caiyixiang
f4da971b86 nginx/pkg/config: delete unuseful variable 2017-05-02 17:24:01 +08:00
Jeff Pearce
a5d58cc521 Override load balancer alg view config map 2017-04-29 08:37:24 -07:00
Manuel de Brito Fontes
f4147e9e6c Avoid running nginx if the configuration file is empty 2017-04-26 23:34:36 -03:00
Arjan Schaaf
389e0f527c Nginx sticky annotations #258 made the global enable-sticky-sessions obsolete 2017-04-21 14:57:45 +02:00
Manuel de Brito Fontes
12d4aadf74 Allow configuration of features underscores_in_headers and ignore_invalid_headers 2017-04-20 18:12:16 -03:00
Manuel de Brito Fontes
786d977a90 Fix lint errors 2017-04-20 16:48:14 -03:00
Manuel de Brito Fontes
de14e2f4f1 Refactor ssl-passthroug using go to handle TLS hello 2017-04-19 01:39:14 -03:00
Justin Santa Barbara
322be61522 Compute server_names_hash_bucket_size correctly
There were some edge cases where we did not calculate hash_bucket_size
correctly.

Fix #623
2017-04-18 22:29:51 -04:00
Manuel de Brito Fontes
aba45a01ad Process exited cleanly before we hit wait4 2017-04-16 20:04:32 -03:00
Manuel de Brito Fontes
9994365ae4 Allow custom server_names_hash_max_size and server_names_hash_bucket_size values 2017-04-14 20:59:10 -03:00
Manuel de Brito Fontes
256cd6b1df Replace custom child reap code with go-reap 2017-04-12 20:20:18 -03:00
Manuel de Brito Fontes
8f3f51367a Remove test because of the refactoring 2017-04-11 14:50:28 -03:00
Manuel de Brito Fontes
190788848a Read resolv file just oncce 2017-04-11 11:47:49 -03:00
Manuel Alejandro de Brito Fontes
64d0b08128 Merge pull request #577 from aledbf/avoid-childs
Avoid zombie child processes
2017-04-09 15:29:04 -03:00
Manuel de Brito Fontes
25bb7e4311 Set different listeners per protocol version 2017-04-09 15:03:27 -03:00
Manuel de Brito Fontes
1c6c4273c9 Avoid child processes 2017-04-09 13:58:03 -03:00
Manuel de Brito Fontes
cbe4029597 Add option to disable hsts preload 2017-04-05 22:48:43 -03:00
Nick Sardo
12a0373d2e Merge pull request #539 from aledbf/migrate-client-go
Migrate to client-go
2017-04-05 13:50:21 -07:00
Manuel de Brito Fontes
e0561ddeb9 Update nginx and generic controller 2017-04-04 11:51:50 -03:00
Giancarlo Rubio
197acf0f2b Build namespace and ingress class as label 2017-04-04 16:23:40 +02:00
Giancarlo Rubio
c21f7ce666 OverrideFlags was called before parsing arguments (arguments was always empty)
correct args order for newStatsCollector
2017-04-04 13:15:06 +02:00
Manuel de Brito Fontes
4103537ea1 Fix lint errors 2017-04-02 11:07:07 -03:00
Manuel Alejandro de Brito Fontes
02cd3ce885 Merge pull request #225 from electroma/nginx/extauth_headers
Support for http header passing from external authentication service
2017-04-01 20:40:29 -03:00
Manuel de Brito Fontes
8e41bdd3d4 Add setting to configure ecdh curve 2017-03-30 23:23:14 -03:00
Manuel de Brito Fontes
cf82f694de Avoid negative values configuring the max number of open files 2017-03-30 10:10:47 -03:00
Manuel de Brito Fontes
1278a97dc6 Convert WorkerProcesses setting to string to allow the value auto 2017-03-28 19:58:09 -03:00
rsafronov
6d07d32003 Merge branch 'upstream' into nginx/extauth_headers 2017-03-24 20:25:18 -04:00
Thomas Peitz
3b55e09e23 Remove unnecessary quote in nginx log format 2017-03-22 15:48:15 +01:00
chentao1596
37bdb3952e fix all go style mistakes about fmt.Errorf 2017-03-17 08:35:55 +08:00
Manuel Alejandro de Brito Fontes
3d681cda78 Merge pull request #430 from ohmystack/fix-baseurl
Fix add-base-url
2017-03-15 19:37:44 -03:00
caiyixiang
3b152e6aa7 0 2017-03-14 19:19:21 +08:00
rsafronov
7034e1de69 Merge remote-tracking branch 'upstream/master' into nginx/extauth_headers
# Conflicts:
#	core/pkg/ingress/annotations/authreq/main.go
2017-03-13 15:04:37 -04:00
ohmystack
bbeb9a766c Fix add-base-url
The "base" tag is used for completing a relative link in current page
by browser, so it should stay the same with the base url of current
page.
2017-03-14 01:04:35 +08:00
Manuel de Brito Fontes
e702c55820 Fix build 2017-03-12 18:11:03 -03:00
Manuel de Brito Fontes
7ba389c1d0 Cleanup collection of prometheus metrics 2017-03-10 16:47:08 -03:00
Giancarlo Rubio
1d38e3a384 Scrap json metrics from nginx vts
upgrade vts to the latest version
2017-03-10 09:25:56 -03:00
Manuel de Brito Fontes
c173985af0 Allow custom http2 header sizes 2017-03-08 20:00:16 -03:00
Gorka Lerchundi Osa
e1c1dfadc7 allow specifying custom dh param
fixes #162
2017-03-08 15:32:32 +01:00
Giancarlo Rubio
63b5f2f1c5 add configuration to disable listening on ipv6 2017-03-08 13:29:02 +01:00
Victor Unegbu
dfdcdfde0b remove tmp nginx-diff files 2017-03-07 09:59:10 -06:00
chentao1596
1417a3a818 add copyright 2017-03-07 15:34:31 +08:00
Manuel de Brito Fontes
f0c758eed2 Fix custom log format 2017-03-06 12:33:51 -03:00
Manuel de Brito Fontes
cd924f5522 Avoid duplication of ReadConfig function 2017-03-04 18:35:33 -03:00
Manuel de Brito Fontes
1473f64fb0 Remove SPDY reference 2017-03-04 18:35:33 -03:00
Manuel de Brito Fontes
3c0fb01ba2 Add warning when the ingress controller uses a custom class 2017-03-04 18:35:33 -03:00
Manuel de Brito Fontes
2399be867e Cleanup custom log format configuration 2017-03-04 18:35:33 -03:00
Manuel Alejandro de Brito Fontes
6cd21f7dea Merge pull request #362 from gianrubio/fix-ingress-class
Fix ingress class
2017-03-03 09:49:59 -03:00
Manuel Alejandro de Brito Fontes
3b2f668f39 Merge pull request #367 from gianrubio/customize-logformat
BuildLogFormatUpstream was always using the default log-format
2017-03-03 09:43:48 -03:00
Manuel Alejandro de Brito Fontes
9f39abc019 Merge pull request #365 from pwillie/forcesslredirect
add ForceSSLRedirect ingress annotation
2017-03-03 09:05:02 -03:00
Giancarlo Rubio
1e5081baf2 BuildLogFormatUpstream function was always using the default log-format-upstream, 2017-03-03 13:03:49 +01:00
caiyixiang
482293b99d add_judgment 2017-03-03 15:17:32 +08:00
Peter Wilson
1a72b3f775 add ForceSSLRedirect ingress annotation 2017-03-03 16:44:29 +11:00
rsafronov
05526e4a66 Merge remote-tracking branch 'upstream/master' into nginx/extauth_headers
# Conflicts:
#	controllers/nginx/pkg/template/template.go
2017-03-02 14:46:18 -05:00
Giancarlo Rubio
2ddba72baa Fix ingress class 2017-03-02 16:50:31 +01:00
Giancarlo Rubio
0ca3aef0f5 Add ability to customize upstream and stream log format 2017-03-01 18:47:11 +01:00
rsafronov
d3b952552a minor: formatting 2017-02-27 16:34:42 -05:00
electroma
c8eda8f17f Merge branch 'master' into nginx/extauth_headers 2017-02-27 16:28:11 -05:00
Manuel de Brito Fontes
84324af140 Refactoring of TCP and UDP services 2017-02-24 20:14:43 -03:00
Giancarlo Rubio
704a18cec9 Add support for proxy cookie path/proxy cookie domain 2017-02-24 16:06:30 +01:00
Marcin Owsiany
192c551abb Fix for formatting error introduced in #304.
Why don't we fail the travis build when go fmt is unhappy?
2017-02-24 12:05:31 +01:00
Manuel Alejandro de Brito Fontes
964aa0a15a Merge pull request #295 from tangle329/master
We need check content, when cmd failed.
2017-02-23 00:28:13 -03:00
Tang Le
c0f0cb2ff7 Check content when cmd failed
Signed-off-by: Tang Le <at28997146@163.com>
2017-02-20 10:34:05 +08:00
caiyixiang
e68abf067b change 'buildSSPassthrouthUpstreams' to 'buildSSLPassthroughUpstreams' 2017-02-20 10:30:37 +08:00
Manuel de Brito Fontes
77221b3555 Fix rewrite regex to match the start of the URL and not a substring 2017-02-17 11:04:57 -03:00
Tang Le
e26efd0b08 We need check content, when cmd failed.
Signed-off-by: Tang Le <at28997146@163.com>
2017-02-17 19:11:56 +08:00
Manuel Alejandro de Brito Fontes
b5819d8f4d Merge pull request #246 from aledbf/set-headers
Add support for custom proxy headers using a ConfigMap
2017-02-16 07:35:57 -03:00
Manuel de Brito Fontes
5c9bf12648 Fix error getting class information from Ingress annotations 2017-02-14 11:02:23 -03:00
Ricardo Pchevuzinske Katz
d0c4e0d713 Adds support for disabling the entire access_log 2017-02-09 21:20:12 -02:00
rsafronov
4c2b2512f5 Merge branch 'upstream' into nginx/extauth_headers 2017-02-08 16:57:03 -05:00
Manuel de Brito Fontes
5cc5669938 Add support for custom proxy headers using a ConfigMap 2017-02-07 17:00:23 -03:00
Manuel Alejandro de Brito Fontes
4eb527d4a9 Merge pull request #228 from tangle329/master
Fix worker check issue
2017-02-07 09:36:55 -03:00
caiyixiang
229250f419 changeUDP 2017-02-07 14:35:39 +08:00
Tang Le
008c47c2d3 Fix worker check issue
Signed-off-by: Tang Le <at28997146@163.com>
2017-02-04 15:37:06 +08:00
rsafronov
302fa5f4bb Added: support for http header passing from external authentication service response 2017-02-03 19:43:15 -05:00
Manuel de Brito Fontes
ec67f83305 Refactoring sysctlFSFileMax helper 2017-01-26 00:10:33 -03:00
Tang Le
c0aca1833a Fix rate limit issue when more than 2 servers enabled in ingress
Signed-off-by: Tang Le <at28997146@163.com>
2017-01-24 16:19:28 +08:00
Tang Le
50297c8f47 Fix issue for ratelimit
Signed-off-by: Tang Le <tangle3@wanda.cn>
2017-01-23 10:01:51 +08:00