Commit graph

842 commits

Author SHA1 Message Date
Nick Sardo
df659732ff Handle a nil configuration file 2017-08-15 16:56:51 -07:00
Fernando Diaz
62fea9aa01 Update Server Alias Annotation with Review Changes
Updates the Server-Alias annotation to create another server
containing the same configuration as the current server, but
with the name provided in the annotation.
2017-08-15 14:49:04 -05:00
Manuel Alejandro de Brito Fontes
c050705b88 Merge pull request #1130 from hzxuzhonghu/patch-1
Update nginx.go
2017-08-15 11:08:52 -03:00
zhengjiajin
6faf87c097 Add short help doc in configuration for nginx limit rate 2017-08-15 16:29:06 +08:00
TigerXu
2af727a33e Update nginx.go
fix typo
2017-08-15 15:14:08 +08:00
TigerXu
92b59fc8bf Update nginx.go 2017-08-15 14:25:46 +08:00
Fernando Diaz
ac504bdbc0 Add support for Server Alias in Nginx
Adds support for server alias in nginx. Adds a new annotation
which allows us to specify a server alias that will be appended
to the server name.
2017-08-13 13:01:00 -05:00
Manuel Alejandro de Brito Fontes
854da227d3 Merge pull request #1118 from zjj2wry/limit-rate
feat(#733)Support nginx bandwidth control
2017-08-13 11:30:57 -03:00
zhengjiajin
890c57f2ca feat(#733)Support nginx bandwidth control 2017-08-13 14:52:20 +08:00
Manuel Alejandro de Brito Fontes
1516493946 Merge pull request #1117 from tonglil/patch-1
Cleanup controllers readme
2017-08-12 09:15:39 -04:00
Denis Andrejew
e713e706cc fix typos in controllers/nginx/README.md 2017-08-12 13:52:17 +02:00
Tony Li
de696af110 cleanup controllers readme 2017-08-12 03:27:47 -04:00
Manuel de Brito Fontes
fb3c7c3714 Cleanup remote address in nginx template 2017-08-10 11:41:14 -04:00
zhengjiajin
2679042925 Fix lose SSL Passthrough 2017-08-10 11:12:12 +08:00
Manuel Alejandro de Brito Fontes
198c926bb9 Merge pull request #1089 from aledbf/update-ngx
Update nginx to 1.13.4
2017-08-08 14:42:01 -04:00
Manuel Alejandro de Brito Fontes
91077a2ed8 Merge pull request #1088 from aledbf/worker-timeout
Configure nginx worker timeout
2017-08-08 14:41:33 -04:00
Manuel de Brito Fontes
c48e412217 Update nginx to 1.13.4 2017-08-08 14:39:28 -04:00
Manuel de Brito Fontes
106cfca1a6 Configure nginx worker timeout 2017-08-08 14:17:49 -04:00
zhengjiajin
f8c4c0da21 Fix some broken link 2017-08-08 17:50:14 +08:00
Manuel de Brito Fontes
f840b076a2 Fix build tasks 2017-08-07 23:08:02 -04:00
Manuel Alejandro de Brito Fontes
cf732e846e Merge pull request #1074 from aledbf/rem-lua
Remove lua and use fastcgi to render errors
2017-08-07 22:15:32 -04:00
Manuel Alejandro de Brito Fontes
a3ca02e6d0 Merge pull request #1075 from zjj2wry/feat/proxy_timeout
(feat/ #374) support proxy timeout
2017-08-07 14:33:13 -04:00
zhengjiajin
13ab894e6f feat/proxytimeout support proxy timeout for stream type 2017-08-08 02:01:12 +08:00
Manuel de Brito Fontes
ff7d72191e Update echoheaders images 2017-08-06 19:22:22 -04:00
Manuel de Brito Fontes
a091d3ede7 Remove lua and use fastcgi to render errors 2017-08-05 16:29:58 -04:00
Manuel Alejandro de Brito Fontes
6403efe0d4 Merge pull request #1058 from sethpollack/rpm
add per minute rate limiting
2017-08-03 20:44:49 -04:00
Nick Sardo
fa8d9e1e57 Remove expectation of promoting ingress to GA 2017-08-03 09:51:40 -07:00
Nick Sardo
fe19ebb09e Merge pull request #1064 from nicksardo/glbc-0.9.6
[GLBC] Bump GLBC version to 0.9.6
2017-08-03 08:13:25 -07:00
Manuel de Brito Fontes
e6f7fefca8 Export TEMP_DIR variable in Makefile 2017-08-03 11:10:30 -04:00
Nick Sardo
ecac1bf213 Bump GLBC version to 0.9.6 2017-08-02 20:49:35 -07:00
Nick Sardo
27e42e9067 Ignore instance groups in use 2017-08-02 15:39:25 -07:00
Nick Sardo
62067fb1b9 Fix fake of instance group mgmt 2017-08-02 14:36:33 -07:00
Nick Sardo
077d1e40bb Merge pull request #1061 from nicksardo/node-syncing
More logging on instance group creation and continue if exists
2017-08-02 13:19:56 -07:00
Nick Sardo
bec28ccf86 Adding few more log messages and comment 2017-08-02 13:16:44 -07:00
Nick Sardo
27add25e6f Merge pull request #1056 from nicksardo/node-log-msg
Log correct list of nodes
2017-08-02 13:11:31 -07:00
Seth Pollack
40a9a54082
add per minute rate limiting 2017-08-01 23:24:48 -04:00
Nick Sardo
213d6b7776 Better handling of race when creating instance groups 2017-08-01 17:56:14 -07:00
Manuel Alejandro de Brito Fontes
d5f11007bb Merge pull request #1054 from cgurnik/cgurnik-patch-1
Fix link to UDP example
2017-08-01 17:30:52 -04:00
Nick Sardo
bf3739d852 Log correct list of nodes 2017-08-01 13:11:58 -07:00
Craig Gurnik
c9ce0dd3cc Fix link to UDP example 2017-08-01 15:29:27 -04:00
nikhiljindal
f2eca78e19 Renaming test file to align with code filename 2017-08-01 12:27:17 -07:00
Pieter Lange
fa5c2a1f72 Allow TEMP_DIR to be set externally 2017-08-01 16:14:42 +02:00
Nick Sardo
8dc3d4764f Update gce cloud calls after api changes 2017-07-31 13:37:57 -07:00
Manuel de Brito Fontes
fe1b913f21 Add function to allow custom values in Ingress status 2017-07-28 20:26:35 -04:00
Nick Sardo
697041aae3 Merge pull request #1023 from nicksardo/gce-retry-fix
GCE: Fix retry of cloudprovider client generation
2017-07-28 15:29:01 -07:00
Nick Sardo
f9ce8d799a Merge pull request #1024 from aledbf/fix-code-removal
GCE: Revert node handlers removal
2017-07-27 11:37:30 -07:00
Manuel Alejandro de Brito Fontes
a56dd7cc38 Merge pull request #1013 from caiyixiang/unify_forms
The fields of vtsDate are unified in the form of plural
2017-07-26 22:39:08 -04:00
Manuel de Brito Fontes
11c0306937 GCE: Revert node handlers removal 2017-07-26 21:46:52 -04:00
Nick Sardo
d59d5c4bf3 Fix retry of cloudprovider client generation 2017-07-26 18:02:30 -07:00
Nick Sardo
16a213c076 Merge pull request #994 from freehan/revendor-godep
Revendor godep
2017-07-26 17:32:18 -07:00
Seth Pollack
bceaa04f3b add docs for proxy-set-headers and add-headers 2017-07-26 08:32:18 -04:00
Minhan Xia
ee3054dd52 adapt gce controller to godep updates 2017-07-25 17:09:27 -07:00
caiyixiang
2b72441bc5 The fields of vtsDate are unified in the form of plural 2017-07-25 14:21:12 +08:00
Frode Egeland
e70678a5b6 Update configuration.md
Remove duplicate line
2017-07-24 17:01:19 +10:00
Manuel de Brito Fontes
060e449056 Update gce controller 2017-07-20 10:43:09 -07:00
Manuel de Brito Fontes
294ecb4986 Update nginx controller 2017-07-20 10:41:50 -07:00
Manuel Alejandro de Brito Fontes
fbb96f4c83 Merge pull request #981 from chrismoos/service_upstream
Add annotation to allow use of service ClusterIP for NGINX upstream.
2017-07-19 12:20:30 -04:00
Chris Moos
666bcca495 Add annotation to allow use of service ClusterIP for NGINX upstream. 2017-07-19 16:02:04 +02:00
Nick Sardo
bc6e5840b6 Merge pull request #962 from ensonic/docs
Update the docs.
2017-07-18 15:10:14 -07:00
John Belamaric
ba7e8f1514 Fix the sed command to work on macOS 2017-07-18 16:41:07 -04:00
Nick Sardo
05ef427a7b Merge pull request #957 from nicksardo/glbc-cleanup
[GLBC] Minor cleanup for logging & future changes
2017-07-17 18:06:57 -07:00
Nick Sardo
25b2723b33 Copy over legacy description; remove unnecessary/verbose log lines 2017-07-17 17:14:43 -07:00
Manuel de Brito Fontes
0d4bf15cb0 Add nginx basic auth example 2017-07-16 16:22:08 -04:00
Manuel de Brito Fontes
f4fe72a247 Release nginx 0.9.0-beta.11 2017-07-15 13:56:38 -04:00
Manuel Alejandro de Brito Fontes
8f38c4acff Merge pull request #960 from aledbf/update-controller-ngx
Update nginx in ingress controller
2017-07-14 18:16:10 -04:00
Stefan Sauer
fccaa14251 Update the docs.
Remove sentence impying that HTTP is not supported. Add missing markdown to ensure
code-blocks are highlighted.

See #951
2017-07-13 18:32:02 +02:00
Bastian Hofmann
38d198bfde Make proxy_headers_hash_bucket_size and proxy_headers_hash_max_size configurable in the nginx controller
See https://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_headers_hash_bucket_size and https://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_headers_hash_max_size
2017-07-13 13:57:03 +02:00
Manuel de Brito Fontes
df2bf96b3f Update nginx in ingress controller 2017-07-12 20:12:41 -04:00
Nick Sardo
26fccdc48b Merge pull request #946 from nicksardo/glbc-remove-quota
GLBC: Remove event message saying "Quota"
2017-07-10 18:23:03 -07:00
Nick Sardo
e0d0771423 Remove misleading msg 2017-07-10 18:21:21 -07:00
n1koo
02832dec6c Add support for add_headers 2017-07-10 09:55:07 +03:00
Georgiy Kutsurua
d56e261835 Sets parameters for a shared memory zone that will keep states for various keys. 2017-07-07 15:45:13 +04:00
Manuel de Brito Fontes
835aea4bab Fix lint code errors 2017-07-06 16:17:46 -04:00
Remington Reackhof
1b3f0acde1 add configmap and template changes for comma separated proxy-real-ip-cidr list 2017-07-06 10:54:36 -05:00
Manuel de Brito Fontes
5d5e0df4b0 Lint code 2017-07-03 22:10:48 -04:00
Manuel de Brito Fontes
6a4679b028 Add support for proxy protocol in TCP services 2017-07-02 17:09:09 -04:00
Manuel de Brito Fontes
4493d9d602 Add release task in Makefiles and avoid multiple builds 2017-06-30 16:19:41 -04:00
Manuel de Brito Fontes
9dec76acda Fix nginx ingress controller release 0.9-beta.9 2017-06-30 10:20:10 -04:00
Manuel de Brito Fontes
b8d571628a Fix docker-push task to publish arm and ppc64le 2017-06-30 00:26:18 -04:00
Manuel de Brito Fontes
796aa945f0 Release nginx ingress controller 0.9-beta.9 2017-06-29 20:00:08 -04:00
Manuel de Brito Fontes
844ea6a864 Add arm and ppc64le support 2017-06-28 20:22:59 -04:00
Manuel Alejandro de Brito Fontes
3c9ac43058 Merge pull request #919 from Collaborne/pr/redirect-per-location
Apply the 'ssl-redirect' annotation per-location
2017-06-28 13:43:44 -04:00
Andreas Kohn
04346a8ec2
Apply the 'ssl-redirect' redirect per-location
This is needed to avoid ingress definitions with different settings for SSL
redirection conflicting with each other.

NB: This was discussed in the review of #427, but ultimately not addressed.
2017-06-28 11:18:06 +02:00
Manuel Alejandro de Brito Fontes
005ed5243f Merge pull request #907 from glerchundi/master
nginx/proxy: allow specifying next upstream behaviour
2017-06-27 19:24:16 -04:00
Gorka Lerchundi Osa
5503e8d0e9 nginx/proxy: allow specifying next upstream behaviour 2017-06-27 23:30:43 +02:00
Manuel de Brito Fontes
5f02858623 Improve X-Forwarded-Host support 2017-06-27 10:08:14 -04:00
Étienne Lafarge
408f32ee9d [doc][nginx] Update NGinX status port to 18080
The docs still states to reach the /nginx_status page on port 8080.
However, it seems that this has been changed :)
2017-06-25 10:41:38 +02:00
Manuel Alejandro de Brito Fontes
312c9ec7e2 Merge pull request #871 from aledbf/fix-sticky
Add feature to allow sticky sessions per location
2017-06-23 13:22:12 -04:00
Manuel de Brito Fontes
b28485cf31 Fix nginx error check 2017-06-23 09:55:45 -04:00
Zihong Zheng
8bd6eca957 Update outdated ingress resource link 2017-06-22 17:30:59 -07:00
Manuel de Brito Fontes
83d03a19a6 Add feature to allow sticky sessions per location 2017-06-22 14:12:57 -04:00
Manuel de Brito Fontes
6e2203594e Add upstream keepalive connections cache 2017-06-21 23:52:06 -04:00
Manuel de Brito Fontes
85e6d30844 Improve variable configuration for source IP address 2017-06-21 00:52:12 -04:00
Manuel de Brito Fontes
df6795c0af Update nginx-slim to 0.19 2017-06-20 22:23:24 -04:00
Itamar Ostricher
488dd077b0 Implement support for GCE health check with HTTP Host Header in GLBC 2017-06-20 14:14:00 +03:00
Manuel de Brito Fontes
4bdf47f96f Add information about nginx controller flags 2017-06-16 16:15:00 -04:00
Manuel Alejandro de Brito Fontes
c6b5335754 Merge pull request #868 from aledbf/lint
Lint nginx code
2017-06-15 00:16:05 -04:00
Manuel de Brito Fontes
92e3b5ba78 Lint nginx code 2017-06-14 23:05:04 -04:00
Nick Sardo
13c6b0e44c Merge pull request #866 from nicksardo/gclb-0.9.5
[GLBC] Bump GLBC version to 0.9.5
2017-06-14 18:24:01 -07:00
Nick Sardo
4ae523e7cb Merge pull request #863 from nicksardo/gce-legacy-healthcheck
[GCLB] Migrate existing health check settings
2017-06-14 18:22:52 -07:00
Nick Sardo
8c69bd90b5 Bump GLBC version to 0.9.5 2017-06-14 18:01:32 -07:00
Nick Sardo
06204c6b1a Gracefully fail on legacy HC delete 2017-06-14 17:09:00 -07:00
Nick Sardo
f65b35f766 Migrate existing health check settings 2017-06-14 16:14:15 -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
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
Giancarlo Rubio
59f08d0b87 Document log-format-stream and log-format-upstream 2017-06-13 16:22:22 +02:00
Manuel de Brito Fontes
51b2e0f2cb Fix IPv6 UDP stream section 2017-06-13 08:45:30 -04:00
Giancarlo Rubio
fffddebdf8 add semicolon 2017-06-13 13:05:43 +02: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
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
Nick Sardo
46a9943eb6 Add websocket example 2017-06-09 12:46:47 -07: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
a4793eda8c Update nginx-slim to 0.18 2017-06-07 11:33:13 -04:00
Nick Sardo
8cd9a5a98a Merge pull request #786 from aledbf/update-echoheaders
Update echoserver image version in examples
2017-06-06 16:38:48 -07:00
Nick Sardo
82bc0059aa Merge pull request #818 from nicksardo/gce-fix-backendStatus
[GLBC] Fix backend status out of bounds error
2017-06-06 13:06:26 -07:00
Nick Sardo
851c9d0d41 Fix backend status out of bounds 2017-06-06 13:02:57 -07:00
Nick Sardo
95114f9a75 Fix mapsEqual out of bounds error 2017-06-06 12:40:37 -07:00
Olve Sæther Hansen
d4600a87b5 Added client_max_body_size to authPath location
Seems like nginx denies the request because it would be over the max body size,
event if `proxy_pass_request_body` is `off`.

This fixes 811
2017-06-02 22:40:29 +02:00
Manuel Alejandro de Brito Fontes
66b4c2606b Merge pull request #809 from aledbf/fix-variables-map
Fix dynamic variable name
2017-06-02 11:59:32 -04:00
Manuel de Brito Fontes
b70e9ca078 Fix dynamic variable name 2017-06-02 11:12:02 -04:00
Arjan Schaaf
a854dc71b2 #789 removing duplicate X-Real-IP header introduced 4bd4bf3be6 2017-05-29 11:43:05 +02: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
b84fc350ee Update echoserver image version in examples 2017-05-28 17:19:34 -04:00
Manuel de Brito Fontes
8837cf93e2 Allow customization of variables hash tables 2017-05-28 16:05:49 -04:00
Manuel Alejandro de Brito Fontes
f00823fd83 Merge pull request #783 from unixwitch/nginx-app-root
nginx/README.md: clarify app-root and fix example hyperlink
2017-05-28 15:43:51 -04:00
Liss Tarnell
6d3e9666ba nginx/README.md: clarify app-root and fix example hyperlink 2017-05-28 20:41:00 +01:00
Manuel Alejandro de Brito Fontes
efd6714d42 Merge pull request #774 from aledbf/fix-tcp-upd-listen
Add IPv6 support in TCP and UDP stream section
2017-05-28 13:11:05 -04:00
Lars Solberg
c12a2fa186 Correcting image version link 2017-05-27 21:04:40 +02:00
Manuel Alejandro de Brito Fontes
865cc78df3 Merge pull request #773 from aknuds1/fix-readme
Fix README WRT. building nginx-ingress-controller
2017-05-27 08:06:33 -04:00
Nick Sardo
fa579af218 Merge pull request #779 from nicksardo/recorder-scheme
Change recorder event scheme for GCE
2017-05-26 15:39:06 -07:00
Nick Sardo
4a43fe400d Use scheme package 2017-05-26 14:43:35 -07:00
Manuel de Brito Fontes
6563330d2b Release nginx ingress controller 0.9-beta.7 2017-05-26 15:10:07 -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
Manuel de Brito Fontes
40cd78d0b8 Add support for IPv6 in TCP and UDP stream section 2017-05-26 12:19:54 -04:00
Arve Knudsen
c34b78b59c Fix README wrt. building nginx-ingress-controller 2017-05-26 16:20:21 +02:00
Matthew Walter
4ef6073f08 Typo fix ingres -> ingress 2017-05-25 23:13:40 -04:00
Nick Sardo
0018fa5b15 Merge pull request #763 from aledbf/release-beta-6
Release nginx ingress controller 0.9-beta.6
2017-05-24 18:02:29 -07:00
Manuel de Brito Fontes
178321b1fe Release nginx ingress controller 0.9-beta.6 2017-05-24 20:14:49 -04:00
Joao Morais
37f8c8bb40 Add ConfigureFlags() on controller interface 2017-05-24 21:03:52 -03:00
Manuel de Brito Fontes
30343c489a Fix bad variable assignment in template nginx 2017-05-24 00:25:42 -04:00
Manuel de Brito Fontes
4d7a280371 Fix server name hash maxSize default value 2017-05-23 20:13:32 -04:00
Nick Sardo
4bed0c8627 Update description if not correct 2017-05-22 16:11:05 -07:00
Manuel de Brito Fontes
07cdee5ca8 Refactoring whitelist source IP verification 2017-05-20 19:32:03 -04:00
Manuel de Brito Fontes
d742dcb55c Specify nginx image arch 2017-05-18 17:57:33 -04:00