Commit graph

1251 commits

Author SHA1 Message Date
Ryan Hitchman
e5d5bda1ca Rewrite echoheaders to use openresty's templating.
This automatically escapes things, and makes the code easier to read.

template.lua was slightly modifed to not escape /, so it is vendored.
2017-06-14 17:54:53 -07:00
Manuel Alejandro de Brito Fontes
e9871ffaad Merge pull request #864 from aledbf/remove-named
Remove dead code
2017-06-14 20:22:48 -04:00
Nick Sardo
06204c6b1a Gracefully fail on legacy HC delete 2017-06-14 17:09:00 -07:00
Manuel de Brito Fontes
45c77a951d Code linting 2017-06-14 19:49:35 -04:00
Manuel de Brito Fontes
aa8c66ec01 Remove dead code 2017-06-14 19:42:13 -04:00
Nick Sardo
f65b35f766 Migrate existing health check settings 2017-06-14 16:14:15 -07:00
Nick Sardo
245e6b0b0e Merge pull request #860 from aledbf/release-0.9-beta.8
Release nginx ingress controller 0.9-beta.8
2017-06-13 22:00:45 -07:00
Manuel de Brito Fontes
4d4ece1d89 Release nginx ingress controller 0.9-beta.8 2017-06-13 22:22:21 -04:00
Nick Sardo
2b2ce3415d Merge pull request #858 from nicksardo/gclb-release-0.9.4
[GLBC] Version bump GLBC to 0.9.4
2017-06-13 15:35:43 -07:00
Nick Sardo
c5e6af2f07 Version bump GLBC to 0.9.4 2017-06-13 15:06:04 -07:00
Nick Sardo
e3c7f070eb Merge pull request #857 from ixdy/glbc-alpine3.6
Rebase glbc on alpine:3.6
2017-06-13 11:59:42 -07:00
Jeff Grafton
a464d5a256 Rebase glbc on alpine:3.6 2017-06-13 11:46:00 -07:00
Manuel Alejandro de Brito Fontes
bd1429ddac Merge pull request #855 from aledbf/lint
Lint code
2017-06-13 11:31:32 -04:00
Manuel Alejandro de Brito Fontes
e9df6faa49 Merge pull request #854 from gianrubio/patch-4
Document log-format-stream and log-format-upstream
2017-06-13 10:29:20 -04:00
Manuel Alejandro de Brito Fontes
1c47c72b86 Merge pull request #852 from gianrubio/patch-3
Don't expose certificate metrics for default server
2017-06-13 10:28:23 -04:00
Giancarlo Rubio
59f08d0b87 Document log-format-stream and log-format-upstream 2017-06-13 16:22:22 +02:00
Giancarlo Rubio
b4c8a66b1f Don't expose certificate metrics for default server
The default server has a self signed certificate so it's not important to monitor
2017-06-13 16:01:05 +02:00
Manuel Alejandro de Brito Fontes
f5a6b79dbd Merge pull request #851 from databus23/patch-1
ensure private key and certificate match
2017-06-13 10:00:23 -04:00
Fabian Ruff
8304feb497 ensure private key and certificate match
Adding an ingress tls secret with a non matching certificate and private key break at least the nginx-controller permanently until the offending secret is deleted.

In that case nginx refuses to start/reload with an error like this:
```
Error: exit status 1
2017/06/13 12:16:53 [emerg] 51#51: SSL_CTX_use_PrivateKey_file("/ingress-controller/ssl/monsoon3-tls-baremetal-3-eu-de-1-cloud-sap.pem") failed (SSL: error:0B080074:x509 certificate routines:X509_check_private_key:key values mismatch)
nginx: [emerg] SSL_CTX_use_PrivateKey_file("/ingress-controller/ssl/tls-baremetal-3-example-com.pem") failed (SSL: error:0B080074:x509 certificate routines:X509_check_private_key:key values mismatch)
nginx: configuration file /tmp/nginx-cfg728491545 test failed
```
2017-06-13 15:16:24 +02:00
Manuel de Brito Fontes
aacb7a5abb Lint 2017-06-13 09:07:14 -04:00
Manuel Alejandro de Brito Fontes
eb61873730 Merge pull request #850 from aledbf/fix-udp
Fix IPv6 UDP stream section
2017-06-13 08:46:46 -04:00
Manuel de Brito Fontes
51b2e0f2cb Fix IPv6 UDP stream section 2017-06-13 08:45:30 -04:00
Manuel Alejandro de Brito Fontes
2ebd98fa02 Merge pull request #848 from gianrubio/ssl-expire-metric
Add metric "ssl certificate expiration"
2017-06-13 08:16:08 -04:00
Manuel Alejandro de Brito Fontes
5d7a938c6a Merge pull request #847 from gianrubio/patch-2
fix semicolon
2017-06-13 08:14:34 -04:00
Giancarlo Rubio
d9cf043552 Instrument nginx to expose metric "ssl certficate expiration time "
Add a console warning message 10 days before the certificate expire
2017-06-13 13:44:00 +02:00
Giancarlo Rubio
fffddebdf8 add semicolon 2017-06-13 13:05:43 +02:00
Manuel Alejandro de Brito Fontes
e258ee19d1 Merge pull request #846 from justinsb/serviceport
Match ServicePort to Endpoints by Name
2017-06-12 23:58:49 -04:00
Justin Santa Barbara
cacc7bc21e Match ServicePort to Endpoints by Name
We can never match on the EndpointPort.Port; that is the container port.
2017-06-12 23:02:28 -04:00
Manuel Alejandro de Brito Fontes
cdbf2aad37 Merge pull request #824 from aledbf/update-nginx-controller
Update nginx-slim to 0.18
2017-06-12 18:39:15 -04:00
Nick Sardo
a5aaf45926 Merge pull request #823 from aledbf/update-nginx
Release nginx-slim 0.18
2017-06-12 15:08:48 -07:00
Manuel Alejandro de Brito Fontes
ff6b713caf Merge pull request #843 from aledbf/low-fs-max
Avoid setting maximum number of open file descriptors lower than 1024
2017-06-12 16:42:36 -04:00
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 Alejandro de Brito Fontes
9c395cd861 Merge pull request #822 from aledbf/master
Release ubuntu-slim 0.11
2017-06-12 15:47:59 -04:00
Manuel Alejandro de Brito Fontes
72f484e72f Merge pull request #837 from aledbf/cleanup-interface
Cleanup interface
2017-06-12 15:41:46 -04:00
Manuel de Brito Fontes
8a8e955b64 Update dummy controller interface 2017-06-11 15:59:44 -04:00
Manuel de Brito Fontes
748f686eca Update nginx interface 2017-06-11 15:56:40 -04:00
Manuel de Brito Fontes
dca6de883c Simplify controller interface 2017-06-11 15:56:30 -04:00
Manuel Alejandro de Brito Fontes
ecb95156ca Merge pull request #836 from coryfklein/master
Make log format json escaping configurable
2017-06-11 14:12:00 -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
Nick Sardo
816b7f511d Merge pull request #834 from nicksardo/gce-websocket-example
[GCLB] Add websocket example
2017-06-09 12:47:48 -07:00
Nick Sardo
46a9943eb6 Add websocket example 2017-06-09 12:46:47 -07:00
Manuel Alejandro de Brito Fontes
dd7090b969 Merge pull request #827 from stp-ip/nginx-rbac
Introduce working example of nginx controller with rbac
2017-06-09 14:36:42 -04: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
Michael Grosser
ec6efbd9d3 Introduce working example of nginx controller with rbac 2017-06-08 06:34:47 +00:00
Manuel Alejandro de Brito Fontes
d556cc07b6 Merge pull request #825 from jcmoraisjr/jm-edit-ingclass
Create or delete ingress based on class annotation
2017-06-07 17:43:35 -04:00
Joao Morais
6b54ae58ac Create or delete ingress based on class annotation 2017-06-07 13:16:34 -03:00
Manuel de Brito Fontes
a4793eda8c Update nginx-slim to 0.18 2017-06-07 11:33:13 -04:00
Manuel de Brito Fontes
98454a0aa2 Release nginx-slim 0.18 2017-06-07 11:07:12 -04:00
Manuel de Brito Fontes
1ea89a6112 Release ubuntu-slim 0.11 2017-06-07 10:38:03 -04:00