Commit graph

872 commits

Author SHA1 Message Date
Nick Sardo
c5af95d722 Merge pull request #386 from itamaro/patch-1
Fix glbc usage string
2017-03-07 15:08:17 -08:00
Manuel de Brito Fontes
0c26b3b86d Remove special check in sort server by name 2017-03-07 20:07:43 -03:00
Tony Li
7f670aba11 GCE pre-shared cert fixes (#395)
* pick up changes to the external cert referenced by lb

* less prone way to check if cert should be deleted
2017-03-07 15:05:21 -08:00
Manuel de Brito Fontes
45cdbc69b2 Listen customization must be done just in one place 2017-03-07 19:50:24 -03:00
Manuel de Brito Fontes
2a9c51fc25 External auth method is optional 2017-03-07 19:45:54 -03:00
Tim St. Clair
f7725d453a Rebase GLBC on busybox 2017-03-07 13:49:43 -08:00
Tony Li
42a01ea99c GCE/GKE "pre-shared" TLS cert (#291)
* add allow-named-tls annotation

* works for setting tls

* fix logs (mostly)

* add ssl cert annotation

* return an error when cert not found

* use annotation if specified, otherwise use spec

* add TODO on naming

* use the annotation key from k8s

* add unit test for HTTPS LB w/ cert annotation

* refactor logic and check for error

* move annotation to controller package

* remove todo for function naming
2017-03-07 13:42:41 -08:00
Manuel Alejandro de Brito Fontes
12b5f97d33 Merge pull request #394 from craigmonson/fix-readme
Update README.md
2017-03-07 18:04:08 -03:00
craigmonson
c3965ed35f Update README.md
fix broken link to config maps
2017-03-07 15:09:50 -05:00
Manuel Alejandro de Brito Fontes
8502ed3462 Merge pull request #392 from aledbf/fix-http2-header-size
Fix http2 header size
2017-03-07 15:05:46 -03:00
Manuel de Brito Fontes
68df375c52 Fix http2 header size 2017-03-07 14:42:59 -03:00
Manuel Alejandro de Brito Fontes
43fd1d9253 Merge pull request #391 from victoru/remove-tmp-nginx-diff-files
remove tmp nginx-diff files
2017-03-07 13:52:25 -03:00
Victor Unegbu
1dc2993e79 remove tmp nginx-diff files 2017-03-07 09:59:10 -06:00
Manuel Alejandro de Brito Fontes
7164c3fd56 Merge pull request #390 from aledbf/fix-rps-comment
Fix RateLimit comment
2017-03-07 12:33:14 -03:00
Manuel de Brito Fontes
8ced81395a Fix RateLimit comment 2017-03-07 11:41:05 -03:00
Manuel Alejandro de Brito Fontes
555ca06fbe Merge pull request #382 from rikatz/ingress-fake-cert
Ingress Fake Certificate generation
2017-03-07 09:21:22 -03:00
Manuel Alejandro de Brito Fontes
a2b152fa02 Merge pull request #385 from chentao1596/copyright-add
add Copyright
2017-03-07 09:20:32 -03:00
Itamar Ostricher
ec10b1b827 Fix glbc usage string
1. Typo in `glbc` binary name
2. Typo in `running-in-cluster` flag
3. Remove non-existing flag `--default-backend-node-port`
2017-03-07 12:09:12 +02:00
chentao1596
9d78d8df70 add copyright 2017-03-07 15:34:31 +08:00
Ricardo Pchevuzinske Katz
ba56f88a61 Temporary PEM Files cleanup 2017-03-06 16:33:44 -03:00
Ricardo Pchevuzinske Katz
50f688fb53 Removes wrong secret enqueing and improve the Fake Cert generation 2017-03-06 16:29:33 -03:00
Nick Sardo
3166c0b8b3 Merge pull request #278 from csbell/fw-name
Extend ConfigMap to store fwrule names
2017-03-06 10:37:20 -08:00
Manuel Alejandro de Brito Fontes
9aabde6e07 Merge pull request #380 from aledbf/fix-log-format
Fix custom log format
2017-03-06 12:57:53 -03:00
Manuel de Brito Fontes
fad9ae904d Fix custom log format 2017-03-06 12:33:51 -03:00
Ricardo Pchevuzinske Katz
71c2731322 Generates a Self signed certificate for default vhost if the secret doesn't exists
Generates a Self signed certificate for default vhost if the secret doesn't exists

	modified:   core/pkg/ingress/controller/backend_ssl.go
	modified:   core/pkg/ingress/controller/controller.go
	modified:   core/pkg/net/ssl/ssl.go
2017-03-06 09:21:08 -03:00
Manuel Alejandro de Brito Fontes
8685ccbebe 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 Alejandro de Brito Fontes
5debc71672 Merge pull request #375 from jcmoraisjr/jm-haproxy-auth-basic
HAProxy Auth Basic sample
2017-03-05 22:10:31 -03:00
Joao Morais
0f5e09b7b8 HAProxy Auth Basic sample 2017-03-05 21:41:12 -03:00
Manuel Alejandro de Brito Fontes
e79ef65276 Merge pull request #373 from aledbf/log-format
Cleanup
2017-03-04 19:04:46 -03:00
Manuel de Brito Fontes
98439e9ded Avoid duplication of ReadConfig function 2017-03-04 18:35:33 -03:00
Manuel de Brito Fontes
1558936d48 Remove SPDY reference 2017-03-04 18:35:33 -03:00
Manuel de Brito Fontes
f19ad83063 Add warning when the ingress controller uses a custom class 2017-03-04 18:35:33 -03:00
Manuel de Brito Fontes
bfa183e174 Cleanup custom log format configuration 2017-03-04 18:35:33 -03:00
Jakob Jarosch
aeeaa34991 Add documentation for ingress.kubernetes.io/force-ssl-redirect
refs #314 #365
2017-03-03 20:29:43 +01:00
Peter Lee
ebf57a8c34 Minor text fix for "ApiServer"
It looks a little weird to apply camel case style for the noun "apiserver", i didn't see somewhere else spelling it in that way.
2017-03-04 00:40:07 +08:00
Manuel Alejandro de Brito Fontes
f20814087e 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
9e74fedc24 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
940a5e542c 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
bc646f571a Merge pull request #365 from pwillie/forcesslredirect
add ForceSSLRedirect ingress annotation
2017-03-03 09:05:02 -03:00
Giancarlo Rubio
6d334f8c8f BuildLogFormatUpstream function was always using the default log-format-upstream, 2017-03-03 13:03:49 +01:00
Manuel Alejandro de Brito Fontes
d91a5ed592 Merge pull request #366 from caiyixiang/add_judgment
add_judgment
2017-03-03 09:02:32 -03:00
caiyixiang
aed822f695 add_judgment 2017-03-03 15:17:32 +08:00
Peter Wilson
4f342cc3c6 add ForceSSLRedirect ingress annotation 2017-03-03 16:44:29 +11:00
Manuel Alejandro de Brito Fontes
133d1210af Merge pull request #354 from caiyixiang/addJudgment
add judgment
2017-03-03 01:03:58 -03:00
caiyixiang
5a29b48fff add judgment 2017-03-03 08:39:18 +08:00
Manuel Alejandro de Brito Fontes
c043af265f Merge pull request #364 from whereisaaron/patch-1
Fix error caused by increasing proxy_buffer_size (#363)
2017-03-02 18:48:19 -03:00
Aaron Roydhouse
19868fd9cc 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
fff6f70bef test fix 2017-03-02 15:48:36 -05:00
rsafronov
92c4f135de 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
Christian Bell
c4f1026e0f Better logging and address review comments 2017-03-02 10:54:32 -08:00