DevFW-CICD/ingress-nginx-helm
12
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3795 commits 4 branches 217 tags 166 MiB
Commit graph

371 commits

Author SHA1 Message Date
Bryan Boreham
f33a2090dd Add a flag to make per-host metrics optional 
When serving many hosts from one nginx, the metrics may become too
numerous for Prometheus.  Add a flag to disable the host label, so
that metrics are totalled across all hosts.
 2018-12-21 17:31:54 +00:00
Fernando Diaz
429110aa13 Add Unit Tests for getIngressInformation 
Adds a unit test for the getIngressInformation
function.
 2018-12-18 11:10:48 -06:00
Elvin Efendi
7a00d52141 fix status updated: make sure ingress.status is copied 2018-12-17 16:19:02 +04:00
Kubernetes Prow Robot
ee3a8fe581
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
f90881b367 Update lua configuration_data when number of controller pod change 2018-12-14 13:34:54 -05:00
Zenara Daley
67654a6fd5 Generalize Rewrite Block Creation 2018-12-13 13:02:05 -05:00
Guihua Zhu
d22146f3b0 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
8ae01a2cf9
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
d5840a4071 make canary ingresses independent of the order they were applied 2018-12-10 13:17:05 -05:00
Kubernetes Prow Robot
f6f18a167d
Merge pull request #3532 from ArchangelSDY/ingress-update 
Ignore updates of ingresses with invalid class
 2018-12-07 04:28:14 -08:00
Maxime Ginters
af460f7e15 Fix a bug with Canary becoming main server 2018-12-06 11:04:32 -05:00
Archangel_SDY
ece5e1c678 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
d58dbde5e3 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
9122c08b3e Ignore updates of ingress with invalid class 2018-12-06 22:02:17 +08:00
Zhenhai Gao
05d2baede6 Fix log output format 
Signed-off-by: Zhenhai Gao <gaozh1988@live.com>
 2018-12-06 09:59:31 +08:00
Manuel Alejandro de Brito Fontes
68f344233b Fix lint issues 2018-12-05 13:28:28 -03:00
Manuel Alejandro de Brito Fontes
1fed943b3d Update process-exporter methods 2018-12-05 13:28:10 -03:00
Manuel Alejandro de Brito Fontes
2fa55eabf6 Replace glog with klog 2018-12-05 13:27:55 -03:00
Manuel Alejandro de Brito Fontes
06d33c16b5
Allow to disable NGINX metrics 2018-12-05 10:14:35 -03:00
Kubernetes Prow Robot
c4ba23832a
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
497246f8ba
Annotations cannot being empty 2018-12-02 16:07:46 -03:00
Manuel Alejandro de Brito Fontes
f78e2e3849
Only copy fields being used 2018-12-02 15:35:36 -03:00
Manuel Alejandro de Brito Fontes
67808c0ed8
Improve parsing of annotations and use of Ingress wrapper 2018-12-02 15:35:36 -03:00
Elvin Efendi
4eabd535f9 be consistent with what Nginx supports 2018-12-02 22:20:56 +04:00
Kubernetes Prow Robot
ccd7b890fd
Merge pull request #3492 from aledbf/fix-units 
Fix data size validations
 2018-12-02 09:01:12 -08:00
Andre Marianiello
b80b19902a Use opentracing_grpc_propagate_context when necessary 2018-12-01 16:31:10 -05:00
k8s-ci-robot
24f3e508b4
Merge pull request #3446 from Shopify/add_tests_merge_canary 
add more testing for mergeAlternativeBackends
 2018-11-30 14:22:44 -08:00
Manuel Alejandro de Brito Fontes
6098f6c0e7
Fix data size validations 2018-11-30 10:40:33 -03:00
Elvin Efendi
e93763da6a delete unused LoadBalanceAlgorithm 2018-11-28 14:49:37 +04:00
Elvin Efendi
60569137ca delete unused buildLoadBalancingConfig 2018-11-28 11:55:41 +04:00
k8s-ci-robot
710ea8c76f
Merge pull request #3333 from Shopify/dont-trust-by-default 
breaking change: by default do not trust any client
 2018-11-27 05:12:48 -08:00
Maxime Ginters
b6b221aebb Watch controller Pods list 2018-11-26 15:35:31 -05:00
Conor Landry
988189cf9f add more testing for mergeAlternativeBackends 
- fix edge cases caught by new testing
 2018-11-26 10:00:57 -05:00
k8s-ci-robot
003027b800
Merge pull request #3443 from aledbf/initial-reload 
Remove initial log error during reconfiguration
 2018-11-21 05:44:54 -08:00
Manuel Alejandro de Brito Fontes
5d4dc78926
Remove initial log error during reconfiguration 2018-11-21 09:28:04 -03:00
k8s-ci-robot
c99716aadf
Merge pull request #3437 from Shopify/ingress-annotations 
Use struct to pack Ingress and its annotations
 2018-11-21 00:41:58 -08:00
Manuel Alejandro de Brito Fontes
a5341822d5 Increase log level when there is an invalid size value 2018-11-20 15:09:03 -03:00
Maxime Ginters
12766cdfc6 Use struct to pack Ingress and its annotations 2018-11-20 09:38:22 -05:00
k8s-ci-robot
96f5ae6668
Merge pull request #3417 from Shopify/fix_canary_merge_self_def 
bugfix: do not merge catch-all canary backends with itself
 2018-11-20 05:03:52 -08:00
k8s-ci-robot
82721e575d
Merge pull request #3372 from Shopify/session-cookie-path 
Add annotation for session affinity path
 2018-11-19 07:25:32 -08:00
Zenara Daley
50b29feb4a Add annotation for session affinity path 2018-11-19 09:15:24 -05:00
Manuel Alejandro de Brito Fontes
af2dce901d
Fix tests 2018-11-18 08:17:18 -03:00
Manuel Alejandro de Brito Fontes
654eceda46
Add tcp e2e test 2018-11-16 21:07:52 -03:00
Manuel Alejandro de Brito Fontes
168f30d1ec Revert removal of support for TCP and UDP services 2018-11-16 13:48:47 -03:00
Conor Landry
ec28539e43 bugfix: do not merge catch-all canary backends with itself 2018-11-13 13:20:15 -05:00
k8s-ci-robot
a22c656f30
Merge pull request #3409 from Shopify/client-max-body-size 
Convert isValidClientBodyBufferSize to something more generic
 2018-11-13 08:36:06 -08:00
Maxime Ginters
0f3e2b9bf0 Convert isValidClientBodyBufferSize to something more generic and use it for client_max_body_size 2018-11-13 10:11:40 -05:00
mikeweiwei
2850fb538a fix logging calls 2018-11-13 16:02:27 +08:00
Elvin Efendi
5f3b48e16d breaking change: do not trust x-forwarded-* headers by default 2018-11-13 10:35:59 +04:00
k8s-ci-robot
950a2f9174
Merge pull request #3387 from xichengliudui/fix181109 
Modify the wrong function name
 2018-11-09 06:14:55 -08:00
xichengliudui
d2b1d37ee3 Modify the wrong function name 2018-11-08 15:17:40 -05:00
Fernando Diaz
5195600841 Allows ModSecurity to be configured per location 
The following annotations will be added:

- enable-modsecurity
- enable-owasp-core-rules
- modsecurity-transaction-id

Fixes #3167
 2018-11-06 22:24:31 -06:00
k8s-ci-robot
17cad51e47
Merge pull request #3341 from Shopify/canary_upstream 
Add canary annotation and alternative backends for traffic shaping
 2018-11-06 12:22:16 -08:00
Conor Landry
412cd70d3a implement canary annotation and alternative backends 
Adds the ability to create alternative backends. Alternative backends enable
traffic shaping by sharing a single location but routing to different
backends depending on the TrafficShapingPolicy defined by AlternativeBackends.

When the list of upstreams and servers are retrieved, we then call
mergeAlternativeBackends which iterates through the paths of every ingress
and checks if the backend supporting the path is a AlternativeBackend. If
so, we then iterate through the map of servers and find the real backend
that the AlternativeBackend should fall under. Once found, the
AlternativeBackend is embedded in the list of VirtualBackends for the real
backend.

If no matching real backend for a AlternativeBackend is found, then the
AlternativeBackend is deleted as it cannot be backed by any server.
 2018-11-06 13:13:14 -05:00
k8s-ci-robot
265f96bf14
Merge pull request #3344 from ecosia/jg-customerrors-per-ingress 
Adds CustomHTTPErrors ingress annotation and test
 2018-11-06 09:21:49 -08:00
jasongwartz
0ebf0354cb Adds CustomHTTPErrors ingress annotation and test 
Adds per-server/location error-catch functionality to nginx template

Adds documentation

Reduces template duplication with helper function for CUSTOM_ERRORS data

Updates documentation

Adds e2e test for customerrors

Removes AllCustomHTTPErrors, replaces with template function with deduplication and adds e2e test of deduplication

Fixes copy-paste error in test, adds additional test cases

Reverts noop change in controller.go (unused now)
 2018-11-06 16:47:52 +01:00
k8s-ci-robot
08d5ffabbf
Merge pull request #3367 from aledbf/503-restart 
Remove reloads when there is no endpoints
 2018-11-06 06:39:04 -08:00
Manuel Alejandro de Brito Fontes
3838145a8c
Remove reloads when there is no endpoints 2018-11-06 09:26:04 -03:00
k8s-ci-robot
ecf605bf60
Merge pull request #3369 from SataQiu/fix-20181106 
Fix some typos
 2018-11-06 04:02:10 -08:00
k8s-ci-robot
c19f7eb1df
Merge pull request #3370 from xichengliudui/fix181106 
Fix typo: whitlelist -> whitelist
 2018-11-06 04:00:49 -08:00
xichengliudui
a13ea30e6d Fix typo: whitlelist -> whitelist 2018-11-06 04:59:03 -05:00
SataQiu
76b5a7b45e fix typos 2018-11-06 15:58:56 +08:00
mooncake
4b518ec03c Fix some typos 
Signed-off-by: mooncake <xcoder@tenxcloud.com>
 2018-11-05 22:10:11 +08:00
liuwei
ce6e564f82 merge from master 2018-11-02 13:13:24 +08:00
Manuel Alejandro de Brito Fontes
71ebe1cba5 Code linting 2018-10-30 20:46:48 -03:00
k8s-ci-robot
bec97b36c7
Merge pull request #3321 from mbode/geoip2 
Add configuration for geoip2 module
 2018-10-30 05:09:38 -07:00
Maximilian Bode
c27c57dc8b Add configuration for geoip2 module 
Based on closed PRs #2551, #2755
 2018-10-29 21:25:23 +01:00
Manuel Alejandro de Brito Fontes
fed013ab6f Fix status update in case of connection errors 2018-10-29 13:01:41 -03:00
liuwei
ad57c76b73 Support cookie expires 2018-10-29 15:21:10 +08:00
Henry Tran
3cbfd63992 Refactor EWMA to not use shared dictionaries 2018-10-25 22:33:42 +04:00
Zenara Daley
9f2a0b6363 Add healthcheck timeout as CLA 2018-10-24 16:02:28 -04:00
Aarni Koskela
4a71111d4c Fix usages of %q formatting for numbers (%d) 
This caused logs like "Adjusting ServerNameHashBucketSize variable to '@'"
 2018-10-23 18:21:16 +03:00
Elvin Efendi
cdb244e579 fix two bugs with backend-protocol annotation 2018-10-19 09:11:21 -04:00
Manuel Alejandro de Brito Fontes
dc553d8f91 Refactor probe url requests 2018-10-15 16:29:32 -03:00
Manuel Alejandro de Brito Fontes
1b63ca355f
Improve dynamic lua confguration 2018-10-12 14:29:41 -03:00
k8s-ci-robot
9af9ef5fd9
Merge pull request #3230 from reactiveops/backoff-dynamic-config 
Retry initial backend configuration
 2018-10-12 10:01:21 -07:00
Corey O'Brien
e0020e22d1 Switch to using wait.ExponentialBackoff 2018-10-12 09:19:20 -04:00
k8s-ci-robot
0baf62dd6a
Merge pull request #3222 from diazjf/add-timeouts-and-such 
Allow Ability to Configure Upstream Keepalive
 2018-10-12 06:15:09 -07:00
Corey O'Brien
ee6bb942e5 Retry initial backend configuration 2018-10-12 00:12:59 -04:00
Fernando Diaz
12955a4a1b Allow Ability to Configure Upstream Keepalive 
Allows Upstream Keepalive values like keepalive_timeout and
keepalive_requests to be configured via ConfigMap.

Fixes #3099
 2018-10-11 20:46:42 -05:00
Manuel Alejandro de Brito Fontes
4c46ee95c9
Update leader election methods 2018-10-10 21:46:45 -03:00
k8s-ci-robot
3038da8719
Merge pull request #3215 from hchenxa/hchenxa 
align opentracing user-guide with nginx configmap configuration
 2018-10-10 06:56:15 -07:00
k8s-ci-robot
3edf11b85f
Merge pull request #3198 from aledbf/only-dynamic 
Only support dynamic configuration
 2018-10-10 05:07:34 -07:00
Hui Chen
f8052385f9 aline opentracing user-guide with nginx configmap configuration 2018-10-10 11:25:53 +08:00
Manuel Alejandro de Brito Fontes
74c2f93de6
Only support dynamic configuration 2018-10-09 22:05:45 -03:00
k8s-ci-robot
f56ab42cd2
Merge pull request #3194 from bshelton229/literal-dollar-character 
Make literal $ character work in set $location_path
 2018-10-09 15:52:39 -07:00
Bryan Shelton
3686e4f366 Move escapeLocationPathVar to escapeLiteralDollar 2018-10-09 12:58:50 -07:00
Elvin Efendi
78f12c25c5 delete upstream healthcheck annotation 2018-10-09 09:14:13 -04:00
Manuel Alejandro de Brito Fontes
859b298d42 Remove annotations grpc-backend and secure-backend already deprecated 2018-10-08 12:26:06 -03:00
Bryan Shelton
3dc131bd57 Make literal $ character work in set $location_path 2018-10-07 12:58:39 -07:00
Manuel Alejandro de Brito Fontes
44bdc7eb59 Remove support for TCP and UDP services 2018-10-07 10:53:37 -03:00
Zenara Daley
bd3f56eaa0 allow curly braces to be used in regex paths 2018-10-04 10:58:38 -04:00
k8s-ci-robot
d9f58144eb
Merge pull request #3145 from Shopify/regex-modifier 
Add "use-regex" Annotation to Toggle Regular Expression Location Modifier
 2018-10-01 11:31:43 -07:00
Zenara Daley
f29bdc3e8d Add 'use regex' annotation to toggle nginx regex location modifier 2018-10-01 13:54:11 -04:00
Zenara Daley
a7c2633e4e remove payload from log (#3135) 2018-09-26 12:09:14 -03:00
Elvin Efendi
b3a22f7fc0 do not require --default-backend-service 2018-09-25 21:14:28 -04:00
k8s-ci-robot
6393ca6aaf
Merge pull request #2997 from StarOfService/global-block-ip-ua-ref 
Provide possibility to block IPs, User-Agents and Referers globally
 2018-09-25 05:51:56 -07:00
Pavel Sinkevych
7212d0081b Provide possibility to block CIDRs, User-Agents and Referers globally 2018-09-25 14:16:20 +03:00
Manuel de Brito Fontes
91ae204f6c Replace standard json encoding with jsoniter 2018-09-22 14:25:01 -03:00
Zenara Daley
0de19c8062 Fix/add unit tests; Styling changes 2018-09-14 15:07:57 -04:00