Commit graph

3628 commits

Author SHA1 Message Date
David Dooling
8950d65614 Add standard labels to namespace specs
Add standard app resource metadata labels to the namespaces specs
created when deploying nginx-ingress.

Closes kubernetes/ingress-nginx#3576
2018-12-18 16:38:42 -06:00
Kubernetes Prow Robot
c8c6ed8f4b Merge pull request #3573 from diazjf/doc-update
Update Certificate Generation Docs to not use MD5
2018-12-18 12:12:07 -08:00
Kubernetes Prow Robot
edb5e3c46c Merge pull request #3566 from diazjf/unit-locs
Add Unit Tests for getIngressInformation
2018-12-18 10:04:55 -08:00
Fernando Diaz
6055f65c17 Update Certificate Generation Docs to not use MD5
Updates the TLS and CA certificate sections to use algorithms
better than md5. Using md5 as a digest causes nginx to fail
to load because it is not accepted by open ssl.

Closes #3571
2018-12-18 11:17:06 -06:00
Fernando Diaz
1915e2e4f1 Add Unit Tests for getIngressInformation
Adds a unit test for the getIngressInformation
function.
2018-12-18 11:10:48 -06:00
Kubernetes Prow Robot
a066c8b9f8 Merge pull request #3569 from Shopify/fix-status-updater
fix status updated: make sure ingress.status is copied
2018-12-17 09:26:55 -08:00
Elvin Efendi
68cd39d21a fix status updated: make sure ingress.status is copied 2018-12-17 16:19:02 +04:00
Kubernetes Prow Robot
c167943dc2 Merge pull request #3505 from Shopify/watch-pod-lua
Update lua configuration_data when number of controller pod change
2018-12-17 00:10:30 -08:00
Maxime Ginters
235583a307 Update lua configuration_data when number of controller pod change 2018-12-14 13:34:54 -05:00
Kubernetes Prow Robot
d035d01114 Merge pull request #3562 from gonzalesraul/patch-1
Rename nginx.yaml to nginx.json
2018-12-14 09:40:12 -08:00
Raul Gonzales
1ba83f196a Rename nginx.yaml to nginx.json 2018-12-14 11:39:12 +00:00
Kubernetes Prow Robot
3477adae4c Merge pull request #3551 from Shopify/nested-wildcart-certificate
Fix --enable-dynamic-certificates for nested subdomain
2018-12-12 07:33:27 -08:00
Maxime Ginters
e06205473f Fix --enable-dynamic-certificates for nested subdomain 2018-12-12 09:16:39 -05:00
Kubernetes Prow Robot
326252a735 Merge pull request #3553 from zhuguihua/handle_error_when_executing_diff
handle_error_when_executing_diff
2018-12-12 04:58:21 -08:00
Guihua Zhu
0de9c2260d handle_error_when_executing_diff
Signed-off-by: Guihua Zhu <zhuguihua@cmss.chinamobile.com>
2018-12-12 13:49:17 +08:00
Kubernetes Prow Robot
85d7cc4e69 Merge pull request #3503 from zhuguihua/compare_error_with_error_types_from_apimachinery
compare error with error types from k8s.io/apimachinery/pkg/api/errors
2018-12-11 00:41:42 -08:00
Kubernetes Prow Robot
20ae6c5d43 Merge pull request #3525 from Shopify/order_independence_canary_ann
make canary ingresses independent of the order they were applied
2018-12-10 11:14:55 -08:00
Conor Landry
79f76dadde make canary ingresses independent of the order they were applied 2018-12-10 13:17:05 -05:00
Kubernetes Prow Robot
8a2353a3be Merge pull request #3536 from aledbf/replace-entrypoint
Replace dockerfile entrypoint
2018-12-10 06:42:00 -08:00
Manuel Alejandro de Brito Fontes
84c6746cdc Replace dockerfile entrypoint 2018-12-07 14:00:55 -03:00
Kubernetes Prow Robot
1845c99fb4 Merge pull request #3532 from ArchangelSDY/ingress-update
Ignore updates of ingresses with invalid class
2018-12-07 04:28:14 -08:00
Guihua Zhu
079ef1fd59 compare error with error types from k8s.io/apimachinery/pkg/api/errors
Signed-off-by: Guihua Zhu <zhuguihua@cmss.chinamobile.com>
2018-12-07 15:42:52 +08:00
Manuel Alejandro de Brito Fontes
e5c41bff42 Update nginx image (#3530) 2018-12-06 15:59:14 -03:00
Kubernetes Prow Robot
86466ee6c4 Merge pull request #3521 from Shopify/fix-canary-server
Fix a bug with Canary becoming main server
2018-12-06 08:54:06 -08:00
Maxime Ginters
23293d96e3 Fix a bug with Canary becoming main server 2018-12-06 11:04:32 -05:00
Archangel_SDY
5433ced47d Pass k8sStore to member functions by pointer
Passing `k8sStore` by value implies read and copy of `backendConfig`,
which is not protected by a mutex and may cause race conditions.
2018-12-06 22:11:19 +08:00
Archangel_SDY
53603e0b04 Add a mutex to protect against simultaneous read/write to backend config
This addresses issues found by race detector.
2018-12-06 22:02:17 +08:00
Archangel_SDY
9b099742a7 Ignore updates of ingress with invalid class 2018-12-06 22:02:17 +08:00
Kubernetes Prow Robot
529086b212 Merge pull request #3508 from aledbf/update-ngx
Update nginx to 1.15.7
2018-12-06 04:49:14 -08:00
Kubernetes Prow Robot
3f79e400aa Merge pull request #3518 from gaozhenhai/master
Fix log output format
2018-12-06 03:41:53 -08:00
Kubernetes Prow Robot
fc5444a590 Merge pull request #3509 from fabiant7t/master
[1759] Ingress affinity session cookie with Secure flag for HTTPS
2018-12-06 01:18:24 -08:00
Fabian Topfstedt
5726188214 testing that a secure cookie gets set when being in ssl mode
Signed-off-by: Fabian Topfstedt <topfstedt@schneevonmorgen.com>
2018-12-06 09:08:25 +01:00
Fabian Topfstedt
400e716659 reverted changing $https globally in the unit tests
Signed-off-by: Fabian Topfstedt <topfstedt@schneevonmorgen.com>
2018-12-06 09:01:08 +01:00
Zhenhai Gao
9f070a41f5 Fix log output format
Signed-off-by: Zhenhai Gao <gaozh1988@live.com>
2018-12-06 09:59:31 +08:00
Kubernetes Prow Robot
5ca10c1d93 Merge pull request #3522 from jmervine/patch-1
{tcp,udp}-services cm appear twice
2018-12-05 12:29:35 -08:00
Joshua Mervine
5922fdc6bc {tcp,udp}-services cm appear twice 2018-12-05 09:15:51 -08:00
Kubernetes Prow Robot
6c5b39b5d8 Merge pull request #3498 from aledbf/update-godeps
Update godeps
2018-12-05 09:07:08 -08:00
Manuel Alejandro de Brito Fontes
6e486e153a Fix lint issues 2018-12-05 13:28:28 -03:00
Manuel Alejandro de Brito Fontes
3b7fef31bb Update process-exporter methods 2018-12-05 13:28:10 -03:00
Manuel Alejandro de Brito Fontes
6c19977d01 Replace glog with klog 2018-12-05 13:27:55 -03:00
Manuel Alejandro de Brito Fontes
011bc4b08e Update go dependencies 2018-12-05 13:27:09 -03:00
Kubernetes Prow Robot
3f8c60ab7a Merge pull request #3512 from aledbf/disable-metrics
Allow to disable NGINX metrics
2018-12-05 08:16:12 -08:00
Manuel Alejandro de Brito Fontes
c59c9d9907 Allow to disable NGINX metrics 2018-12-05 10:14:35 -03:00
Kubernetes Prow Robot
d596d1588e Merge pull request #3474 from aledbf/improve-parsing
Improve parsing of annotations and use of Ingress wrapper
2018-12-05 03:33:18 -08:00
Manuel Alejandro de Brito Fontes
40da70ab15 Fix error in configmap yaml definition (#3516) 2018-12-04 20:06:14 -03:00
Kubernetes Prow Robot
945a08c536 Merge pull request #3513 from dmxlsj/revert_tcp_udp
Revert removal of TCP and UDP support configmaps in mandatroy manifest
2018-12-04 14:16:44 -08:00
Sungmin Lee
b3929fd582 Revert removal of TCP and UDP support configmaps in mandatroy manifest 2018-12-04 13:13:09 -08:00
Manuel Alejandro de Brito Fontes
427aa15a86 Update mkdocs [skip ci] (#3510) 2018-12-04 11:58:03 -03:00
Fabian Topfstedt
3c13d79c48 [1759] Ingress affinity session cookie with Secure flag for HTTPS
Signed-off-by: Fabian Topfstedt <topfstedt@schneevonmorgen.com>
2018-12-04 10:51:52 +01:00
Kubernetes Prow Robot
1b4558c1c1 Merge pull request #3482 from gorshunovr/patch-1
Annotations doc links: minor fixes and unification
2018-12-03 14:07:50 -08:00