Commit graph

1226 commits

Author SHA1 Message Date
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
Manuel Alejandro de Brito Fontes
dfccb44167 Merge pull request #488 from canhnt/master
Adds support for CORS on error responses and Authorization header
2017-03-26 08:00:34 -03:00
Manuel Alejandro de Brito Fontes
b7367a98b6 Merge pull request #498 from jcmoraisjr/jm-fix-enqueue-secret
Proper enqueue a secret on the secret queue
2017-03-26 07:57:24 -03:00
Joao Morais
f945624e9c Proper enqueue a secret on the secret queue 2017-03-25 21:10:20 -03:00
rsafronov
6d07d32003 Merge branch 'upstream' into nginx/extauth_headers 2017-03-24 20:25:18 -04:00
Manuel Alejandro de Brito Fontes
e8b61b40d9 Merge pull request #490 from chentao1596/name_port_unittest
Add unit test case for named_port
2017-03-24 07:25:52 -03:00
chentao1596
740f7caeb8 add unit test case for named_port 2017-03-24 14:18:17 +08:00
chentao1596
9f5ed978b9 use interface instead of implementation 2017-03-24 10:20:44 +08: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
Nick Sardo
116fbe8c33 Merge pull request #477 from nicksardo/glbc-service-watch
[GLBC] Sync ingress when default backend service is modified.
2017-03-22 13:08:30 -07:00
Nick Sardo
a94d31e87d glbc: watch backend service 2017-03-22 13:07:37 -07:00
Nick Sardo
0a75f42884 Merge pull request #479 from matthewg/master
Add 35.191.0.0/16 range to GCE firewalls
2017-03-22 10:22:46 -07:00
Manuel Alejandro de Brito Fontes
8c7f3ab8e6 Merge pull request #481 from tsupertramp/fix-nginx-log-format
Remove unnecessary quote in nginx log format
2017-03-22 13:18:35 -03:00
Manuel Alejandro de Brito Fontes
2a9ac83056 Merge pull request #485 from cy-play/fix-typos-custom-vts-metrics
Fix typo nginx configMap vts metrics customization
2017-03-22 13:17:38 -03:00
mrmm
031fdfd730 Fix typo nginx configMap vts metrics customization 2017-03-22 15:12:52 +00:00
Thomas Peitz
3b55e09e23 Remove unnecessary quote in nginx log format 2017-03-22 15:48:15 +01:00
Matthew Sachs
04b87d5945 Add 35.191.0.0/16 range to GCE firewalls (issue #478) 2017-03-22 00:18:26 -07:00
Manuel Alejandro de Brito Fontes
fc5da49617 Merge pull request #474 from zouyee/master
add custom vts metrics example
2017-03-21 23:10:51 -03:00
zoues
5446208d5f Update README.md 2017-03-22 09:38:21 +08:00
Nick Sardo
509aaf10c6 Merge pull request #472 from nicksardo/git-ignore-glbc
[gce] Add .gitignore
2017-03-21 12:43:19 -07:00
zoues
be05d403ac fix vts readme 2017-03-21 23:35:43 +08:00
zoues
1f1829f42b add custom vts metrics example 2017-03-21 23:29:57 +08:00
shijunqian
43469a8179 Pass request port to real server 2017-03-21 10:33:11 +08:00
Manuel Alejandro de Brito Fontes
1739327ec3 Merge pull request #471 from dannyk81/nginx/prometheus-scrape-annotations
[Nginx] prometheus scrape annotations
2017-03-20 21:48:09 -03:00
Danny Kulchinsky
6a38a1ac37 Adding Prometheus metrics scrape annotations
Allow Prometheus automatic discovery of nginx metrics endpoint

Fixed https://github.com/kubernetes/ingress/issues/464
2017-03-20 20:17:07 -04:00
Nick Sardo
3706f32639 git ignore glbc 2017-03-20 16:36:18 -07:00
Nick Sardo
62070a15e2 Merge pull request #111 from chentao1596/fix-go-style-mistake-errorf
fix some go style mistakes about fmt.Errorf
2017-03-17 11:08:03 -07:00
Manuel Alejandro de Brito Fontes
faac9e1e54 Merge pull request #460 from caiyixiang/scaling_haproxy
add example of 'run multiple haproxy ingress controllers as a deployment'
2017-03-17 08:58:22 -03:00
caiyixiang
ee63e4576d add scaling haproxy 2017-03-17 17:14:35 +08:00
Manuel Alejandro de Brito Fontes
35e43110b5 Merge pull request #459 from aledbf/log-ssl-information
Add information about SSL certificates in the default log level.
2017-03-16 23:56:03 -03:00
chentao1596
37bdb3952e fix all go style mistakes about fmt.Errorf 2017-03-17 08:35:55 +08:00
Manuel de Brito Fontes
18492c1384 Add information about SSL certificates in the default log level. 2017-03-16 16:02:15 -03:00
Manuel Alejandro de Brito Fontes
a5f8fe240c Merge pull request #456 from aledbf/avoid-duplicated-us
Avoid upstreams with multiple servers with the same port
2017-03-16 12:31:10 -03:00
Manuel de Brito Fontes
d82544fe80 Avoid upstreams with multiple servers with the same port 2017-03-16 08:20:52 -03: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
Ricardo Pchevuzinske Katz
6f25329308 Changes the NGINX Rewrite Example location 2017-03-15 23:07:26 -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
Manuel Alejandro de Brito Fontes
8a977cb1d7 Merge pull request #450 from lkirill/nginx-udp-and-udp-fix
fix nginx-udp-and-udp on same port
2017-03-15 15:12:51 -03:00
Kirill Levin
23c45340be fix nginx-udp-and-udp on same port 2017-03-15 20:45:21 +03:00
Manuel Alejandro de Brito Fontes
4f04537eb0 Merge pull request #445 from aledbf/remove-fake-cert
Remove snakeoil certificate generation
2017-03-15 09:54:14 -03:00
Manuel Alejandro de Brito Fontes
ac43d766ec Merge pull request #446 from gianrubio/remove-configmap-validation
remove configmap validations .
2017-03-15 09:10:24 -03:00
Giancarlo Rubio
3570d44370 remove configmap validations . rollback #441, fix #443 2017-03-15 12:39:39 +01:00
Manuel de Brito Fontes
350c5f2c03 Remove snake oil certificate generation 2017-03-15 08:23:25 -03:00
Ricardo Katz
98abd6dd11 Corrects the README header from Rewrite docs 2017-03-14 22:22:02 -03:00
Manuel Alejandro de Brito Fontes
b7b6b9040e Merge pull request #442 from ixdy/nginx-ingress-controller-makefile
Fix a few bugs in the nginx-ingress-controller Makefile
2017-03-14 18:55:17 -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
Manuel Alejandro de Brito Fontes
2f01845964 Merge pull request #441 from gianrubio/skip-validation
skip validation when configmap is empty
2017-03-14 11:25:23 -03:00