Commit graph

409 commits

Author SHA1 Message Date
Giancarlo Rubio
197acf0f2b Build namespace and ingress class as label 2017-04-04 16:23:40 +02:00
Manuel Alejandro de Brito Fontes
22c3226377 Merge pull request #550 from gianrubio/fix-args
Fix args
2017-04-04 09:16:43 -03: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 Alejandro de Brito Fontes
79f8019c5b Merge pull request #493 from aledbf/update-nginx
Update nginx and vts module
2017-04-03 19:33:05 -03:00
Manuel de Brito Fontes
bc68f9eea3 Update nginx and vts module 2017-04-02 16:07:38 -03: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 Alejandro de Brito Fontes
c14d0d852b Merge pull request #532 from aledbf/ssl_ecdh_curve
Add setting to configure ecdh curve
2017-03-31 11:55:44 -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
3fc79625e6 Fix link to examples 2017-03-30 23:13:43 -03:00
Manuel de Brito Fontes
7e86cfe64b Fix link to custom nginx configuration 2017-03-30 23:01:45 -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 Alejandro de Brito Fontes
39feaf10df Merge pull request #516 from aledbf/workers-auto
Convert WorkerProcesses setting to string to allow the value auto
2017-03-28 19:59:22 -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
Andreas Kohn
9dcac88b3d Fix typos regarding the ssl-passthrough annotation documentation 2017-03-27 10:19:21 +02:00
Manuel de Brito Fontes
40f9064ca3 Add information about SSL Passthrough annotation 2017-03-26 17:25:05 -03:00
Manuel Alejandro de Brito Fontes
f5211458ce Merge pull request #454 from danielqsj/master
Pass request port to real server
2017-03-26 08:01:11 -03:00
rsafronov
6d07d32003 Merge branch 'upstream' into nginx/extauth_headers 2017-03-24 20:25:18 -04:00
Canh Ngo
46a42a2905 Adds support for CORS with Authorization header 2017-03-23 16:17:47 +01:00
Canh Ngo
df76382055 Adds support for CORS on error responses 2017-03-23 16:17:37 +01:00
Thomas Peitz
3b55e09e23 Remove unnecessary quote in nginx log format 2017-03-22 15:48:15 +01:00
shijunqian
43469a8179 Pass request port to real server 2017-03-21 10:33:11 +08:00
chentao1596
37bdb3952e fix all go style mistakes about fmt.Errorf 2017-03-17 08:35:55 +08:00
Manuel Alejandro de Brito Fontes
c25936df62 Merge pull request #427 from rikatz/app-root-redirect
Adds support for root context redirection
2017-03-16 07:32:30 -03: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
Kirill Levin
23c45340be fix nginx-udp-and-udp on same port 2017-03-15 20:45:21 +03:00
Manuel de Brito Fontes
350c5f2c03 Remove snake oil certificate generation 2017-03-15 08:23:25 -03:00
Jeff Grafton
071ac58564 Fix a few bugs in the nginx-ingress-controller Makefile
* make 'clean' use the new path to the built binary
* make 'container' depend on 'build'
2017-03-14 14:50:52 -07:00
Tim Hockin
3dd746136b Merge pull request #434 from aledbf/0.9-beta.3
Release 0.9-beta.3
2017-03-14 10:54:45 -07:00
Manuel de Brito Fontes
1aa8223889 Release 0.9-beta.3 2017-03-14 12:19:37 -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
Ricardo Pchevuzinske Katz
0e5d3ca9e9 Adds support for root redirection, and improves rewrite documentation 2017-03-13 12:03:47 -03:00
Ricardo Katz
c41e6bd82f Merge 04af55af3c into 0cb8f59f70 2017-03-12 22:09:42 +00:00
Ricardo Pchevuzinske Katz
04af55af3c Adds support for root context redirection 2017-03-12 19:06:10 -03: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 Alejandro de Brito Fontes
dd7f8b4a97 Merge pull request #408 from gianrubio/fix-links
Review docs
2017-03-10 07:26:24 -03:00
Manuel Alejandro de Brito Fontes
a5f8af70bf Merge pull request #410 from aledbf/colemickens-signin-url
Add support for "signin url"
2017-03-09 11:21:42 -03:00
Cole Mickens
09e6aabce4 Add auth-signin annotation 2017-03-08 20:24:01 -03:00
Manuel de Brito Fontes
c173985af0 Allow custom http2 header sizes 2017-03-08 20:00:16 -03:00
Giancarlo Rubio
a2edde35fc fix some broken links
upgrade all nginx examples to latest version
moved some examples from contrib to this repo
2017-03-08 22:22:31 +01: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
Manuel de Brito Fontes
bebd596b3f Listen customization must be done just in one place 2017-03-07 19:50:24 -03:00
craigmonson
6e6aae6c29 Update README.md
fix broken link to config maps
2017-03-07 15:09:50 -05:00
Manuel de Brito Fontes
484bd43111 Fix http2 header size 2017-03-07 14:42:59 -03: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 Alejandro de Brito Fontes
de8b9b8df2 Merge pull request #370 from foxylion/force-ssl-redirect-documentation
Add documentation for ingress.kubernetes.io/force-ssl-redirect
2017-03-05 22:11:05 -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
Jakob Jarosch
74d57c9502 Add documentation for ingress.kubernetes.io/force-ssl-redirect
refs #314 #365
2017-03-03 20:29:43 +01:00
Manuel Alejandro de Brito Fontes
75124bc9f1 Merge pull request #356 from gianrubio/patch-1
Disable listen only on ipv6 and fix proxy_protocol
2017-03-03 09:50:43 -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
Aaron Roydhouse
336f3cb108 Fix error caused by increasing proxy_buffer_size (#363)
This fixes the bug raised in #363, by increasing the size of the proxy_buffers (memory allocation) to match the size of the proxy buffer. This leaves the default values (with no ingress setting) unchanged:
```
proxy_buffer_size      4k
proxy_buffers            4 4k
```
If 'proxy-buffer-size' is set, then now both the buffer size and the memory allocation size is increased:
```
proxy_buffer_size     "{{ $location.Proxy.BufferSize }}";
proxy_buffers           4 "{{ $location.Proxy.BufferSize }}";
```
I have been using this patch with 0.8.3 and 0.9.0-beta.2.
2017-03-02 16:11:27 -05: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
Giancarlo Rubio
90fdea751b Disable listen only on ipv6 and fix proxy_protocol
- Always listen on ipv4 address for port 443
- Rollback previous PR #227 that broke the proxy_protocol when passthroughBackends is disabled
2017-03-01 15:31:00 +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
02d44ccbaa Fix client source IP address 2017-02-26 19:01:07 -03:00
Ricardo Pchevuzinske Katz
a342c0bce3 Adds correct support for TLS Muthual autentication and depth verification
modified:   controllers/nginx/configuration.md
	modified:   controllers/nginx/rootfs/etc/nginx/template/nginx.tmpl
	modified:   core/pkg/ingress/annotations/authtls/main.go
	modified:   core/pkg/ingress/controller/backend_ssl.go
	modified:   core/pkg/ingress/controller/controller.go
	modified:   core/pkg/ingress/controller/util_test.go
	modified:   core/pkg/ingress/resolver/main.go
	modified:   core/pkg/ingress/types.go
	modified:   core/pkg/net/ssl/ssl.go
	modified:   examples/PREREQUISITES.md
	new file:   examples/auth/client-certs/nginx/README.md
	new file:   examples/auth/client-certs/nginx/nginx-tls-auth.yaml
2017-02-24 22:49:01 -03:00
Manuel de Brito Fontes
84324af140 Refactoring of TCP and UDP services 2017-02-24 20:14:43 -03:00
Manuel Alejandro de Brito Fontes
33ab550290 Merge pull request #332 from aledbf/snippets
Add annotation to customize nginx configuration
2017-02-24 18:39:45 -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 de Brito Fontes
a20c287614 Add annotation to customize nginx location configuration 2017-02-23 16:48:59 -03: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
Manuel de Brito Fontes
7013a52ee5 Return sorted endpoints 2017-02-22 14:41:44 -03:00
Manuel de Brito Fontes
036892fb96 Release 0.9.0-beta.2 2017-02-22 14:41:43 -03:00
Manuel Alejandro de Brito Fontes
5ab0f284b0 Merge pull request #306 from caiyixiang/modifyNGINXreadme
modify nginx readme
2017-02-20 08:01:31 -03:00
Manuel Alejandro de Brito Fontes
463ff2b453 Merge pull request #304 from caiyixiang/changeSStoSSL
change 'buildSSPassthrouthUpstreams' to 'buildSSLPassthroughUpstreams'
2017-02-20 08:00:15 -03:00
chentao1596
a74fe3426a Add docs for body-size annotation 2017-02-20 18:01:57 +08:00
caiyixiang
488d89db18 modify nginx readme 2017-02-20 15:58:16 +08: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
8fd12b26ba Change nginx variable to use in filter of access_log 2017-02-17 18:21:46 -03:00
Manuel Alejandro de Brito Fontes
e603066d92 Merge pull request #290 from aledbf/update-nginx
Update nginx version in ingress controller to 1.11.10
2017-02-17 15:46:52 -03:00
Manuel Alejandro de Brito Fontes
5fab1e99fe Merge pull request #296 from aledbf/fix-rewrite
Fix rewrite regex to match the start of the URL and not a substring
2017-02-17 15:12:18 -03: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
Prashanth B
3d9f89be1d Merge pull request #293 from tonglil/gcloud-docker
Update makefile gcloud docker command
2017-02-17 07:07:25 +05:30
Tony Li
f32ef32489 do the same for nginx 2017-02-16 17:12:33 -08:00
Prashanth B
698c08402a Merge pull request #258 from rikatz/nginx-sticky-annotations
Nginx sticky annotations
2017-02-17 05:27:18 +05:30
Manuel de Brito Fontes
2d0971d6b0 Update nginx version in ingress controller to 1.11.10 2017-02-16 15:10:14 -03: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 Alejandro de Brito Fontes
111f338fa3 Merge pull request #272 from aledbf/refactor-annotation-parsers
Fix error getting class information from Ingress annotations
2017-02-16 07:35:34 -03:00
Ricardo Pchevuzinske Katz
e5c9c788a5 Correct the configuration.md reference to annotations 2017-02-16 08:31:01 -02:00