Commit graph

203 commits

Author SHA1 Message Date
Manuel de Brito Fontes
f28142ae8e Replace secret workqueue 2017-04-09 13:52:10 -03:00
Joao Morais
239166b4b7 Revert merge annotations to the implicit root context 2017-04-06 22:18:51 -03:00
Joao Morais
4558ef6a52 Fix intermittent misconfiguration of backend.secure and sticky 2017-04-05 22:21:34 -03:00
Manuel Alejandro de Brito Fontes
ed6987e716 Merge pull request #540 from jcmoraisjr/jm-ssl-passthrough
Add Backends.SSLPassthrough attribute
2017-04-05 17:53:29 -03:00
Nick Sardo
12a0373d2e Merge pull request #539 from aledbf/migrate-client-go
Migrate to client-go
2017-04-05 13:50:21 -07:00
Manuel de Brito Fontes
e0561ddeb9 Update nginx and generic controller 2017-04-04 11:51:50 -03:00
Giancarlo Rubio
c21f7ce666 OverrideFlags was called before parsing arguments (arguments was always empty)
correct args order for newStatsCollector
2017-04-04 13:15:06 +02:00
Andreas Kohn
049790918c
Fix a couple of 'does not contains' typos 2017-04-03 12:22:08 +02:00
Manuel de Brito Fontes
4103537ea1 Fix lint errors 2017-04-02 11:07:07 -03:00
Joao Morais
b59d49a4a7 Add Backends.SSLPassthrough attribute 2017-04-01 23:32:22 -03:00
Manuel Alejandro de Brito Fontes
02cd3ce885 Merge pull request #225 from electroma/nginx/extauth_headers
Support for http header passing from external authentication service
2017-04-01 20:40:29 -03:00
Manuel Alejandro de Brito Fontes
638ea2b51e Merge pull request #527 from jcmoraisjr/jm-ann-root-context
Add annotations to location of default backend (root context)
2017-04-01 11:21:06 -03:00
Manuel de Brito Fontes
00ce4f46f3 Add test for ingress status update 2017-03-31 09:46:51 -03:00
Joao Morais
8552351af0 Add annotations to location of default backend (root context) 2017-03-30 22:30:39 -03:00
Andreas Kohn
33715a9c8e Fix a typo in an error message 2017-03-30 13:00:31 +02:00
Ash Berlin
6ac7a12a60 Use whitelist-source-range from configmap when no annotation on ingress.
Even though we were returning a SourceRange it was being ignored because
we were also returning an error. Detect the case (and add tests) when
the annotation is not present and use the BackendConfig in that case.

Fixes #473.
2017-03-29 13:09:03 +01:00
chentao1596
767591fa18 remove unused constants 2017-03-27 10:11:40 +08:00
chentao1596
6ab3a21971 add unit test cases for core/pkg/ingress/controller/annotations 2017-03-27 10:06:07 +08:00
Joao Morais
567041ea0d Improve TLS secret configuration 2017-03-26 09:28:59 -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
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
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
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 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
Giancarlo Rubio
3570d44370 remove configmap validations . rollback #441, fix #443 2017-03-15 12:39:39 +01: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
Giancarlo Rubio
1e1e4dca94 skip validation on empty configmap 2017-03-14 14:45:47 +01:00
Manuel Alejandro de Brito Fontes
153fdf516e Merge pull request #439 from Collaborne/pr/nil-reference-temp-file
Avoid a nil-reference when the temporary file cannot be created
2017-03-14 10:29:07 -03:00
Andreas Kohn
3dece0ab70
Avoid a nil-reference when the temporary file cannot be created 2017-03-14 13:52:38 +01:00
Andreas Kohn
dbeead3615
Fix typo in error message 2017-03-14 13:51:29 +01:00
Andreas Kohn
6e017269db
Fix grammar in error messages 2017-03-14 13:51:23 +01:00
Manuel Alejandro de Brito Fontes
03c43b611c Merge pull request #432 from gianrubio/validate-configmap
Validations
2017-03-14 09:22:02 -03:00
Giancarlo Rubio
c6195c44f3 Validate if configmap exist and is in the namespace/name format
Verifiy if watch-namespace option exist
2017-03-14 09:45:01 +01:00
Ian Quick
0fa2a32b6f pass the ingress in or the 2nd invocation will be used 2017-03-13 18:39:35 -04:00
rsafronov
7034e1de69 Merge remote-tracking branch 'upstream/master' into nginx/extauth_headers
# Conflicts:
#	core/pkg/ingress/annotations/authreq/main.go
2017-03-13 15:04:37 -04:00
Ricardo Pchevuzinske Katz
0e5d3ca9e9 Adds support for root redirection, and improves rewrite documentation 2017-03-13 12:03:47 -03:00
Ricardo Pchevuzinske Katz
04af55af3c Adds support for root context redirection 2017-03-12 19:06:10 -03:00
Manuel de Brito Fontes
1cc0a95966 Manually sync secrets from certificate authentication annotations 2017-03-10 12:34:13 -03:00
Manuel de Brito Fontes
ad24784700 Only update Ingress status for the configured class 2017-03-09 22:04:03 -03:00
Cole Mickens
09e6aabce4 Add auth-signin annotation 2017-03-08 20:24:01 -03:00
Gorka Lerchundi Osa
e1c1dfadc7 allow specifying custom dh param
fixes #162
2017-03-08 15:32:32 +01:00
Manuel de Brito Fontes
9ed7bc6ad1 Remove special check in sort server by name 2017-03-07 20:07:43 -03:00
Manuel de Brito Fontes
7f73916715 External auth method is optional 2017-03-07 19:45:54 -03:00
Manuel de Brito Fontes
91904de4a1 Fix RateLimit comment 2017-03-07 11:41:05 -03:00
Ricardo Pchevuzinske Katz
e107e2b87f Temporary PEM Files cleanup 2017-03-06 16:33:44 -03:00
Ricardo Pchevuzinske Katz
51235a38e8 Removes wrong secret enqueing and improve the Fake Cert generation 2017-03-06 16:29:33 -03:00
Ricardo Pchevuzinske Katz
6c1b45a663 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
6cd21f7dea Merge pull request #362 from gianrubio/fix-ingress-class
Fix ingress class
2017-03-03 09:49:59 -03:00
Peter Wilson
1a72b3f775 add ForceSSLRedirect ingress annotation 2017-03-03 16:44:29 +11:00
caiyixiang
248f6ade75 add judgment 2017-03-03 08:39:18 +08:00
rsafronov
d5ede33f88 test fix 2017-03-02 15:48:36 -05:00
rsafronov
05526e4a66 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
Giancarlo Rubio
2ddba72baa Fix ingress class 2017-03-02 16:50:31 +01:00
Ricardo Pchevuzinske Katz
02fbf00fcb Checks if the TLS secret contains a valid keypair structure, with 'CERTIFICATE' before the Private Key 2017-03-01 15:44:39 -03:00
electroma
c8eda8f17f Merge branch 'master' into nginx/extauth_headers 2017-02-27 16:28:11 -05:00
Manuel Alejandro de Brito Fontes
fb8e2d7373 Merge pull request #351 from danielqsj/master
Enable custom election id for status sync.
2017-02-27 09:19:15 -03:00
shijunqian
2d526b213c Enable custom election id for status sync. 2017-02-27 15:35:04 +08: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
a44130f7f5 Fix lint error 2017-02-24 21:54:47 -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
Manuel de Brito Fontes
c6dd2db550 Fix node lister when --watch-namespace is used 2017-02-24 14:18:10 -03:00
Giancarlo Rubio
704a18cec9 Add support for proxy cookie path/proxy cookie domain 2017-02-24 16:06:30 +01:00
Marcin Owsiany
5159afad2a Fix for vet complaints: #335. 2017-02-24 11:56:31 +01:00
Manuel de Brito Fontes
a20c287614 Add annotation to customize nginx location configuration 2017-02-23 16:48:59 -03:00
fate-grand-order
3d0e374f9e fix misspell "affinity" in main.go 2017-02-23 21:59:09 +08:00
Manuel de Brito Fontes
7013a52ee5 Return sorted endpoints 2017-02-22 14:41:44 -03:00
Manuel Alejandro de Brito Fontes
05235588ff Merge pull request #281 from andrewstuart/master
Add chmod up directory tree for world read/execute on directories
2017-02-18 09:33:08 -03:00
Manuel Alejandro de Brito Fontes
a9d68545ef Merge pull request #286 from aledbf/cleanup
Add logs to help debugging and simplify default upstream configuration
2017-02-18 09:32:27 -03: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
8bebfbecaf Add logs to help debugging and simplify default upstream configuration 2017-02-16 14:26:58 -03:00
Kraig Amador
0d05db2d66 Added a Node StoreLister type to support writing ingress controllers that use NodePorts 2017-02-16 09:51:57 -07: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
Andrew Stuart
2b02ea6530
Add chmod up directory tree for world read/execute on directories 2017-02-15 12:29:27 -07:00
Ricardo Pchevuzinske Katz
b06ead1ea3 Corrects the affinity test 2017-02-15 11:50:10 -02:00
Manuel de Brito Fontes
5c9bf12648 Fix error getting class information from Ingress annotations 2017-02-14 11:02:23 -03:00
Ricardo Pchevuzinske Katz
0161ae43d9 Improve in documentation and naming case 2017-02-14 08:49:10 -02:00
Ricardo Pchevuzinske Katz
a158e5fc5a Improve the session affinity feature 2017-02-12 21:13:39 -02:00
Manuel de Brito Fontes
eb69a1d011 Fix rewrite annotation parser 2017-02-11 19:12:56 -03:00
joshrosso
e247fdb7b6 types.go: fix typo in godoc
in an backend -> in a backend
2017-02-10 10:16:43 -07:00
Ricardo Pchevuzinske Katz
6809319318 Adds support for configuring stickness per Ingress 2017-02-10 12:24:16 -02:00
chentao1596
9aa601f8df add unit test cases for core.pkg.ingress.status.election 2017-02-10 16:08:31 +08:00
chentao1596
f33a925e81 add unit test cases for core.pkg.ingress.status.status 2017-02-10 16:03:12 +08:00
Ricardo Pchevuzinske Katz
79e186cb77 New sticky session configuration 2017-02-10 01:33:23 -02:00
Ricardo Pchevuzinske Katz
1dbe65ecb6 Initial support for sticky config in annotations 2017-02-10 01:00:17 -02:00
chentao1596
a72e94f297 modify to get the right content when updating ingress 2017-02-10 10:51:11 +08:00
chentao1596
a77dd5dfd0 remove redudant alias 2017-02-10 10:47:18 +08: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
caiyixiang
229250f419 changeUDP 2017-02-07 14:35:39 +08:00
Manuel de Brito Fontes
80a0481550 Change searchs with searches 2017-02-05 19:41:05 -03:00
Manuel Alejandro de Brito Fontes
2b4a044d21 Merge pull request #212 from aledbf/udp-services
Simplify code to obtain TCP or UDP services
2017-02-04 18:22:15 -03:00
rsafronov
66813229f8 Merge branch 'upstream' into nginx/extauth_headers 2017-02-03 20:10:57 -05:00
rsafronov
302fa5f4bb Added: support for http header passing from external authentication service response 2017-02-03 19:43:15 -05:00
Joao Morais
b7e8bde0e9 Fix panic if a tempfile cannot be created 2017-02-03 18:50:51 -02:00