merge upstream release 0.15.0 #10

christopherriley · 2018-06-15T21:23:46Z

WHAT

merge release 0.15.0 into gladly fork

➜  ingress-nginx git:(upstream-0.15.0-take3) ✗ git merge nginx-0.15.0

...

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   Gopkg.lock                # accepted theirs
	both modified:   Makefile                  # resolved by hand
	both modified:   images/nginx/Dockerfile   # resolved by hand
	both modified:   images/nginx/Makefile     # resolved by hand
	both modified:   images/nginx/build.sh     # resolved by hand

TESTING

updated galaxy chart with this release and deployed to scaletest - looks good

* correct spelling * correct typo

to kubernetes

$path here is the regular expression formatted nginx location not the origin path in ingress rules. Fix kubernetes#2131

…#2241) This reverts commit d8efd39.

add http/2

If the origin ingress rule has no field `path`, the default value will be an empty string which will cause issues when rendering template as other place will use `/` as the default value. Set the default value of path to `/` when retrieve ingress rules from api-server. Thie will fix kubernetes#1980

a typo fix

It should be "your Ingress targets" in line 7.

Signed-off-by: Sylvain Rabot <s.rabot@lectra.com>

The nginx.conf generated now is too messy remove some section only useful when dynamic configure enabled and headers only useful for https.

* Update modsecurity.md Some typo fixes * Update modsecurity.md

Small typo fix .

…#2280) * set proxy_upstream_name correctly when auth_req module is used * log a more meaningful message when backend is not found

…ubernetes#2254) * e2e tests for dynamic configuration and Lua features * do not rely on force reload to dynamically configure when reload is needed * fix misspelling * skip dynamic configuration in the first template rendering * dont error on first sync

…ontroller (kubernetes#2283)

…ubernetes#2243) * Add NoAuthLocations and default it to "/.well-known/acme-challenge" * Add e2e tests for no-auth-location * Improve wording of no-auth-location tests

Refactor Lua balancer

add resty cookie

[ci skip] bump nginx baseimage version

…gress-docs Add some clarification around multiple ingress controller behavior

Update go version in fortune teller image

Adds Make Ingress-Nginx Work for you, and the Community Video to the documentation.

Refactor update of status removing initial check for loadbalancer

Add KubeCon Europe 2018 Video to documentation

force backend sync when worker starts

Fix and simplify local dev workflow and execution of e2e tests

Remove warning when secret is used only for authentication

Release nginx ingress controller 0.15.0

fqsghostcloud and others added 30 commits March 22, 2018 08:14

Correct typo (kubernetes#2238)

4b9cb90

* correct spelling * correct typo

fix-link (kubernetes#2239)

65fde75

Add missing configuration in kubernetes#2235 (kubernetes#2236)

b45ee8d

to kubernetes (kubernetes#2240)

e1c7892

to kubernetes

fix: cannot set $service_name if use rewrite (kubernetes#2220)

0b0a274

$path here is the regular expression formatted nginx location not the origin path in ingress rules. Fix kubernetes#2131

Revert "Get file max from fs/file-max. (kubernetes#2050)" (kubernetes…

39cb880

…#2241) This reverts commit d8efd39.

add http/2

84a6e0c

Merge pull request kubernetes#2242 from agau4779/http2

935a5ef

add http/2

Fix grpc json tag name (kubernetes#2246)

b0a63fe

Add EWMA as configurable load balancing algorithm (kubernetes#2229)

6e099c5

Update go dependencies (kubernetes#2234)

93c72ef

Add deployment docs for AWS NLB (kubernetes#1785)

cd96245

Update annotations.md (kubernetes#2255)

5c016be

a typo fix

Update README.md (kubernetes#2267)

6bc4dad

It should be "your Ingress targets" in line 7.

Managing a whitelist for _/nginx_status (kubernetes#2187)

3853689

Signed-off-by: Sylvain Rabot <s.rabot@lectra.com>

Revert deleted assignment in kubernetes#2146 (kubernetes#2270)

5738ddb

Use SharedIndexInformers in place of Informers (kubernetes#2271)

b09ecf7

clean up tmpl (kubernetes#2263)

c6c219a

The nginx.conf generated now is too messy remove some section only useful when dynamic configure enabled and headers only useful for https.

Disable opentracing for nginx internal urls (kubernetes#2272)

146db43

Typo fixes in modsecurity.md (kubernetes#2274)

660e67d

* Update modsecurity.md Some typo fixes * Update modsecurity.md

Update go to 1.10.1 (kubernetes#2273)

46a97a4

Update README.md (kubernetes#2276)

bcb162a

Small typo fix .

Fix bug when auth req is enabled(external authentication) (kubernetes…

931e541

…#2280) * set proxy_upstream_name correctly when auth_req module is used * log a more meaningful message when backend is not found

Fix nlb instructions (kubernetes#2282)

e761191

Fix flaky e2e tests by always waiting after redeploying the ingress c…

9b4d7f2

…ontroller (kubernetes#2283)

Add NoAuthLocations and default it to "/.well-known/acme-challenge" (k…

e7aa74b

…ubernetes#2243) * Add NoAuthLocations and default it to "/.well-known/acme-challenge" * Add e2e tests for no-auth-location * Improve wording of no-auth-location tests

Update controller.go (kubernetes#2285)

83974c3

Fix custom-error-pages image publication script (kubernetes#2289)

e2937cc

ElvinEfendi and others added 23 commits May 10, 2018 13:47

upstream-hash-by should override load-balance annotation

992a68d

Merge pull request kubernetes#2472 from ElvinEfendi/refactor-round-robin

c01d537

Refactor Lua balancer

add resty cookie

86b0846

Merge pull request kubernetes#2490 from Shopify/add-resty-cookie

e82cb31

add resty cookie

[ci skip] bump nginx baseimage version

b4b0bbe

Merge pull request kubernetes#2495 from Shopify/bump-baseimage

01eff79

[ci skip] bump nginx baseimage version

Add some clarification around multiple ingress controller behavior

17e5b35

Merge pull request kubernetes#2498 from mtougeron/clarify-multiple-in…

108be3b

…gress-docs Add some clarification around multiple ingress controller behavior

Update go version in fortune teller image

c210f80

Refactor update of status removing initial check for loadbalancer

5505174

Merge pull request kubernetes#2502 from aledbf/update-go

c8fec06

Update go version in fortune teller image

Add KubeCon Europe 2018 Video to documentation

17307c3

Adds Make Ingress-Nginx Work for you, and the Community Video to the documentation.

Merge pull request kubernetes#2501 from aledbf/refactor-status

d234dd4

Refactor update of status removing initial check for loadbalancer

Merge pull request kubernetes#2503 from diazjf/add-video

6aeb7ce

Add KubeCon Europe 2018 Video to documentation

force backend sync when worker starts

44ddd8a

Merge pull request kubernetes#2511 from Shopify/bug-fix

7983a2b

force backend sync when worker starts

Remove warning when secret is used only for authentication

b57a7cf

Fix and simplify local dev workflow and execution of e2e tests

d4f2b5d

Merge pull request kubernetes#2514 from aledbf/simplify-workflow

71158e0

Fix and simplify local dev workflow and execution of e2e tests

Merge pull request kubernetes#2512 from aledbf/custom-error

b674973

Remove warning when secret is used only for authentication

Release nginx ingress controller 0.15.0

c07cb23

Merge pull request kubernetes#2516 from aledbf/release-0.15.0

df61bd7

Release nginx ingress controller 0.15.0

Merge tag 'nginx-0.15.0' into upstream-0.15.0-take3

ed2dd11

christopherriley changed the title ~~Upstream 0.15.0 take3~~ merge upstream release 0.15.0 Jun 15, 2018

christopherriley requested review from ramakuka-zz, darend and purva1192 June 15, 2018 21:40

darend approved these changes Jun 25, 2018

View reviewed changes

christopherriley merged commit ab52682 into master Jun 25, 2018

christopherriley deleted the upstream-0.15.0-take3 branch June 25, 2018 21:37

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

merge upstream release 0.15.0 #10

merge upstream release 0.15.0 #10

christopherriley commented Jun 15, 2018 •

edited

Loading

merge upstream release 0.15.0 #10

merge upstream release 0.15.0 #10

Conversation

christopherriley commented Jun 15, 2018 • edited Loading

WHAT

TESTING

christopherriley commented Jun 15, 2018 •

edited

Loading