Commit graph

391 commits

Author SHA1 Message Date
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
Manuel Alejandro de Brito Fontes
a8b89677d6 Merge pull request #275 from aledbf/pass-headers
Pass headers to custom error backend
2017-02-14 18:05:22 -03:00
Manuel de Brito Fontes
0cdc4bd8ba Pass headers to custom error backend 2017-02-14 17:43:31 -03:00
Manuel de Brito Fontes
5c9bf12648 Fix error getting class information from Ingress annotations 2017-02-14 11:02:23 -03:00
Arnd Hannemann
f46aedd7a2 Fix typo in nginx README 2017-02-14 10:06:44 +01:00
Manuel Alejandro de Brito Fontes
aa02b7e085 Merge pull request #244 from aledbf/annotations-docs
Add information about cors annotation
2017-02-13 17:59:47 -03:00
Ricardo Pchevuzinske Katz
a158e5fc5a Improve the session affinity feature 2017-02-12 21:13:39 -02:00
bprashanth
8ea814264d Add nginx README and configuration docs back 2017-02-10 10:59:40 -08:00
Ricardo Pchevuzinske Katz
6809319318 Adds support for configuring stickness per Ingress 2017-02-10 12:24:16 -02:00
Ricardo Pchevuzinske Katz
79e186cb77 New sticky session configuration 2017-02-10 01:33:23 -02: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
Leszek Charkiewicz
ee484aa19f Fix wrong URL in nginx ingress configuration 2017-02-07 20:26:11 +01:00
Manuel de Brito Fontes
c83d46ef86 Add information about cors annotation 2017-02-07 11:17:25 -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
Manuel de Brito Fontes
36f842c011 Add information about proxy_protocol in port 442 2017-02-04 21:29:35 -03:00
Manuel Alejandro de Brito Fontes
e35e5bfce5 Merge pull request #227 from justinsb/use_proxy_protocol
proxy_protocol on ssl_passthrough listener
2017-02-04 21:22:47 -03:00
Justin Santa Barbara
8d71557b13 Remove proxy_protocol from 442 listener
The proxy_protocol processing should only happen once, on the
"external-facing" listeners.
2017-02-04 19:02:24 -05:00
Justin Santa Barbara
6fa461c2a7 proxy_protocol on ssl_passthrough listener
Move proxy_protocol to listener.

Fix #207
2017-02-04 02:38:36 -05: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
Jeff Grafton
bc020f1370 Always docker --pull when building to fetch latest base images 2017-02-01 19:04:23 -08:00
bprashanth
3a37607138 Change nginx controller image to 0.9.0-beta.1 2017-01-30 12:13:06 -08:00
Manuel de Brito Fontes
2887daaf78 Release 0.9.0 2017-01-27 18:23:15 -03:00
Manuel de Brito Fontes
c3ac562429 Fix template error 2017-01-27 17:52:09 -03:00
Manuel Alejandro de Brito Fontes
87d4145c76 Merge pull request #178 from aledbf/proxy-name
Add initialization of proxy variable
2017-01-26 16:50:20 -03:00
Ricardo Pchevuzinske Katz
cc1413261f Allows the usage of Default SSL Cert 2017-01-26 16:51:55 -02:00
Manuel de Brito Fontes
2baa1def46 Add initialization of proxy variable 2017-01-26 11:52:48 -03:00
Manuel de Brito Fontes
ec67f83305 Refactoring sysctlFSFileMax helper 2017-01-26 00:10:33 -03:00
Manuel de Brito Fontes
08eda50ebb Update nginx to 1.11.9 2017-01-25 15:16:31 -03:00
Manuel Alejandro de Brito Fontes
099fba21c8 Merge pull request #165 from tangle329/master
Fix rate limit issue when more than 2 servers enabled in ingress
2017-01-25 07:35:25 -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
Peter Sutherland
8fae080cce Remove SPDY documentation as it is broken 2017-01-23 14:50:52 +00:00
Peter Sutherland
e665072eaa Document more parameters and list defaults 2017-01-23 14:20:21 +00:00
Peter Sutherland
6c8792d80a Add whitelist-source-range to config map docs 2017-01-23 13:34:15 +00:00
Tang Le
50297c8f47 Fix issue for ratelimit
Signed-off-by: Tang Le <tangle3@wanda.cn>
2017-01-23 10:01:51 +08:00
Manuel de Brito Fontes
3df139cb56 Add configuration and annotation for port_in_redirect 2017-01-21 23:01:21 -03:00
Manuel de Brito Fontes
87322b84ba Add support for custom header sizes 2017-01-21 12:46:20 -03:00
Manuel de Brito Fontes
b0c2619594 Add annotation to allow custom body sizes 2017-01-21 11:50:05 -03:00
chentao1596
7bcdef0505 adjust some improper punctuations 2017-01-20 10:55:18 +08:00
chentao1596
08149a7a21 fix wrong link(change titile) 2017-01-20 10:38:31 +08:00
Manuel Alejandro de Brito Fontes
fbcedc02dc Merge pull request #132 from pedrosland/docs/nginx-controller-config-1
Document nginx controller configuration tweaks
2017-01-19 15:07:40 -03:00
Peter Sutherland
292375e8b4 Incorporate more feedback 2017-01-19 18:03:44 +00:00
Manuel Alejandro de Brito Fontes
7553ab361a Merge pull request #136 from chentao1596/add-info-about-MapHashBucketSize
Add content and descriptions about nginx's configuration
2017-01-19 09:10:20 -03:00
Manuel Alejandro de Brito Fontes
0ed8260704 Merge pull request #133 from aledbf/fix-tcp-stream
Add TCP and UDP services removed in migration
2017-01-19 09:06:03 -03:00
Justin Santa Barbara
f1520a1232 Merge pull request #142 from aledbf/file-max
Use system fs.max-files as limits instead of hard-coded value
2017-01-19 01:46:49 -05:00
Manuel de Brito Fontes
9ce52c51f1 Use system fs.max-files as limits instead of hard-coded value 2017-01-19 00:29:31 -03:00
Manuel de Brito Fontes
ba98383c2d Add TCP and UDP services removed in migration 2017-01-18 23:46:03 -03:00
Manuel de Brito Fontes
7fa5aecd71 Add reuse port and backlog to port 80 and 443 2017-01-18 23:04:00 -03:00
caiyixiang
5131b76fe5 const-reference 2017-01-18 11:29:59 +08:00
chentao1596
af8f2881f1 add content: Server-side HTTPS enforcement through redirect 2017-01-18 10:21:29 +08:00
chentao1596
4fbe1ed422 add description for 'map-hash-bucket-size' 2017-01-18 09:58:22 +08:00
Peter Sutherland
9e94863db2 Incorporate feedback 2017-01-17 14:47:54 +00:00
Peter Sutherland
b81a49cdfd Sort config map params alphabetically 2017-01-15 23:38:57 +00:00
Peter Sutherland
727eb2ce81 Many mostly small tweaks to the documentation 2017-01-15 23:38:50 +00:00
Manuel de Brito Fontes
64a5e43394 Add tests and godebug to compare structs 2017-01-13 10:26:13 -03:00
Manuel de Brito Fontes
dbd368adf2 Add nginx tests 2017-01-13 09:54:00 -03:00
Manuel Alejandro de Brito Fontes
71492a6f8f Merge pull request #115 from safework/master
add default_server to listen statement for default backend
2017-01-13 09:11:25 -03:00
Manuel Alejandro de Brito Fontes
43a3d67561 Merge pull request #99 from aledbf/update-nginx
Update nginx to 1.11.8
2017-01-12 21:17:17 -03:00
Manuel de Brito Fontes
597a0e691a Deny location mapping in case of specific errors 2017-01-12 13:40:32 -03:00
Manuel Alejandro de Brito Fontes
c49b03facc Merge pull request #123 from aledbf/fix-resolver
Add resolver configuration to nginx
2017-01-12 13:03:46 -03:00
Manuel de Brito Fontes
d570ea6381 Add resolver configuration to nginx 2017-01-12 12:31:39 -03:00
Mark Cola
939c6d9128 add default_server to listen statement for default backend 2017-01-09 11:30:44 +11:00
Manuel de Brito Fontes
af9375aa96 Add support to disable server_tokens directive 2017-01-02 16:27:57 -03:00
Manuel de Brito Fontes
c0b5be6ff7 Refactoring of nginx configuration deserialization 2017-01-02 11:09:24 -03:00
Prashanth B
5cdb8fe4fb Merge pull request #77 from aledbf/dns-resolver
Add support for IPV6 in dns resolvers
2017-01-01 20:21:52 -08:00
Manuel de Brito Fontes
def1e034d8 Update nginx to 1.11.8 2016-12-29 20:27:21 -03:00
Justin Santa Barbara
fb8208cf8b Fix typo PassthrougBackends -> PassthroughBackends 2016-12-29 17:57:51 -05:00
Manuel de Brito Fontes
99209ad33d Add support for IPV6 in dns resolvers 2016-12-28 07:30:58 -03:00
Manuel de Brito Fontes
3b4358b861 Fix x-forwarded-port mapping 2016-12-26 10:56:22 -03:00
Manuel de Brito Fontes
99fb1f4874 Fix incorrect X-Forwarded-Port for TLS 2016-12-22 10:03:58 -03:00
Manuel Alejandro de Brito Fontes
f0762ba144 Merge pull request #34 from euank/nginx-ipv6ish
nginx: also listen on ipv6
2016-12-21 13:53:49 -03:00
Giancarlo Rubio
bda6646905 Fix "invalid port in upstream" on nginx controller 2016-12-14 17:42:34 +01:00
Prashanth B
0af8cccc7f Merge pull request #54 from bprashanth/devel_docs
Expand developer docs
2016-12-13 14:21:17 -08:00
bprashanth
939cb9c122 Expand developer docs 2016-12-13 10:50:08 -08:00
Euan Kemp
8fe1efe396 nginx: also listen on ivp6
This allows a brave user to run this in host networking mode and support
ipv6.
2016-12-12 09:56:42 -08:00
Giancarlo Rubio
bd9ec42042 fix typo in variable ProxyRealIPCIDR 2016-12-12 14:23:45 +01:00
Manuel de Brito Fontes
86dbf979cb Add nginx metrics to prometheus 2016-11-29 18:10:06 -03:00
Manuel de Brito Fontes
81cd7782c6 Restart nginx if master process dies 2016-11-29 14:21:44 -03:00
Manuel de Brito Fontes
478d51c827 Add healthz checker 2016-11-27 02:28:04 -03:00
Manuel de Brito Fontes
16c5800545 Add e2e boilerplate 2016-11-23 21:34:30 -03:00
Manuel de Brito Fontes
42b58e957c Avoid nginx reloads 2016-11-23 21:19:07 -03:00
Manuel de Brito Fontes
5a8e090736 Add Generic interface 2016-11-23 21:17:49 -03:00
Manuel de Brito Fontes
f2b627486d Remove interface 2016-11-23 21:17:49 -03:00
Manuel de Brito Fontes
ed9a416b01 Split implementations from generic code 2016-11-23 21:17:49 -03:00
Manuel de Brito Fontes
0dbe499a3b Fix lint errors 2016-11-11 19:46:09 -03:00
Manuel de Brito Fontes
e963d095ab Remove nginx-alpha, examples and simplify read files 2016-11-10 18:46:41 -03:00
Kubernetes Submit Queue
bff5d0e5a2 Merge pull request #1879 from r2d4/map_hash_bucket_size
Automatic merge from submit-queue

Make map_hash_bucket_size configurable

I was getting an error while trying to run the nginx controller in minikube.  This allows this nginx configuration option to be passed in through a configmap.  

The default value depends on the processor's cache line size (32 | 64 | 128), however ServerNameHashBucketSize is determined similarly, so I've set it to the same default (64).

Fixes #1817

ref https://github.com/kubernetes/minikube/issues/611

cc @bprashanth
2016-11-03 09:39:47 -07:00
Kubernetes Submit Queue
e1faa8ebe9 Merge pull request #1813 from marketlogicsoftware/kayrus/nginx-log-format
Automatic merge from submit-queue

Added domain name and server port into nginx logs

I replaced dashes so it shouldn't brake log parsers.
In addition here are the [fluentd rules](dc71d8db4a/docker/fluentd/td-agent.conf (L230..L237)) which parse these logs (requires https://github.com/tagomoris/fluent-plugin-parser plugin)
2016-10-25 09:51:43 -07:00
Manuel de Brito Fontes
248699cbc3 Sync yaml probes with published image 2016-10-21 11:59:12 -03:00
Matt Rickard
c8487c1973 Make map_hash_bucket_size configurable 2016-10-14 11:20:34 -07:00
Kubernetes Submit Queue
6456025035 Merge pull request #1830 from aledbf/dbackend
Automatic merge from submit-queue

[nginx-ingress-controller] Add support for default backend in Ingress rule

replaces #1759
2016-10-06 14:28:10 -07:00
Kubernetes Submit Queue
a2aae637dc Merge pull request #1808 from whitlockjc/document-nginx-connection-header
Automatic merge from submit-queue

ingress/controllers/nginx: WebSocket documentation

For those that do not understand the default way in which nginx proxies
requests not containing a "Connection" header, the approach for enabling
WebSocket support might not make sense.  This commit adds documentation
that explains why things are done this way.
2016-10-05 10:09:18 -07:00
Manuel de Brito Fontes
a0776997c3 Add support for default backend in Ingress rule 2016-10-04 09:28:21 -03:00
Manuel de Brito Fontes
541928e27d Add external authentication using auth_request 2016-10-03 11:54:02 -03:00
kayrus
0bae7c4b7c Added domain name and server port into nginx logs 2016-09-30 12:32:25 +02:00
Manuel de Brito Fontes
25bf00a1fc Add docs about the log format 2016-09-29 22:16:32 -03:00
Jeremy Whitlock
0373ce6f31 ingress/controllers/nginx: WebSocket documentation
For those that do not understand the default way in which nginx proxies
requests not containing a "Connection" header, the approach for enabling
WebSocket support might not make sense.  This commit adds documentation
that explains why things are done this way.
2016-09-29 15:42:46 -06:00
Kubernetes Submit Queue
90d8402293 Merge pull request #1802 from aledbf/fix-vars
Automatic merge from submit-queue

[nginx-ingress-controller] Initialize proxy_upstream_name variable

fixes #1801
2016-09-29 11:28:25 -07:00
Manuel de Brito Fontes
75dd1d3c6a Initialize proxy_upstream_name variable 2016-09-29 14:53:54 -03:00
Manuel de Brito Fontes
db3388e777 Avoid replacing nginx.conf file if the new configuration is invalid 2016-09-28 21:35:20 -03:00
Manuel de Brito Fontes
e74b8039a5 Add annotation to add CORS support 2016-09-27 13:35:57 -03:00
Kubernetes Submit Queue
b49a91965c Merge pull request #1786 from aledbf/custom-funcs-docs
Automatic merge from submit-queue

[nginx-ingress-controller] Add docs about go template

Address https://github.com/kubernetes/contrib/pull/1711#issuecomment-249474385
2016-09-26 15:44:20 -07:00
Kubernetes Submit Queue
741ac710cd Merge pull request #1749 from aledbf/cloud-health-check
Automatic merge from submit-queue

[nginx-ingress-controller] Readiness probe that works behind a CP lb

fixes #1507
2016-09-26 15:44:12 -07:00
Manuel de Brito Fontes
428d8e3a85 Add docs about go template 2016-09-26 11:41:29 -03:00
Kubernetes Submit Queue
d90ceb7f3c Merge pull request #1711 from aledbf/add-helper-to-funcmap
Automatic merge from submit-queue

[nginx-ingress-controller]: Add function helpers to nginx template

fixes #1695
2016-09-25 21:03:32 -07:00
Brad Bowman
c33d05a467 Fix link to auth example 2016-09-22 14:33:22 -06:00
Manuel de Brito Fontes
a965f44f84 Clarify the controller uses endpoints and not services 2016-09-21 17:53:39 -03:00
Manuel de Brito Fontes
4e722f9d6d Add the name of the upstream in the log 2016-09-18 11:50:42 -03:00
Manuel de Brito Fontes
9d4dfe7609 Change readiness probe for nginx ingress that works behind a CP lb 2016-09-16 19:09:29 -03:00
Kubernetes Submit Queue
77afc22875 Merge pull request #1743 from vyshane/nginx-ingress-controller-proxy-buffer-size-2
Automatic merge from submit-queue

Allow customisation of the nginx proxy_buffer_size directive via ConfigMap

I'm opening a new PR with the same changes as #1693 because I pushed the latter with an email address that can't be used to sign the CLA. Description from the previous PR:

When using nginx as a proxy we can run into the following error:

```
upstream sent too big header while reading response header from upstream
```

In order to fix this, we need to be able to configure the proxy_buffer_size nginx directive to increase its value. This PR updates the nginx-ingress-controller to allow that.
2016-09-15 09:49:58 -07:00
Vy-Shane Xie
ae1c4503b3 Allow customisation of the nginx proxy_buffer_size directive via ConfigMap 2016-09-15 23:14:16 +08:00
oilbeater
baf5c07446 Fix typo 2016-09-12 19:00:12 +08:00
Jan Chaloupka
8053699360 Remove "All rights reserved" from all the headers 2016-09-08 13:02:39 +02:00
Manuel de Brito Fontes
15cc763b2d Add function helpers to nginx template 2016-09-07 13:21:28 -07:00
Kubernetes Submit Queue
fbff29d1ec Merge pull request #1672 from pdoreau/patch-1
Automatic merge from submit-queue

Add firewall rules and ing class clarifications
2016-09-02 14:39:33 -07:00
Pierrick
aad635636b Update README.md 2016-09-02 23:11:22 +02:00