DevFW-CICD/ingress-nginx-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2852 from Shopify/fix-2513

Browse source 
fix custom-error-pages functionality in dynamic mode
This commit is contained in:
k8s-ci-robot 2018-07-26 12:04:57 -07:00 committed by GitHub
commit d26357734e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
internal/ingress/controller/nginx_test.go
View file

@ -148,8 +148,8 @@ func TestConfigureDynamically(t *testing.T) {
t.Errorf("unexpected target reference in JSON content: %v", body) t.Errorf("unexpected target reference in JSON content: %v", body)
} }
if strings.Contains(body, "service") { if !strings.Contains(body, "service") {
t.Errorf("unexpected service reference in JSON content: %v", body) t.Errorf("service reference should be present in JSON content: %v", body)
} }
})) }))

11
rootfs/etc/nginx/lua/util/dns.lua
View file

@ -31,11 +31,15 @@ end
function _M.resolve(host) function _M.resolve(host)
local cached_addresses = cache:get(host) local cached_addresses = cache:get(host)
if cached_addresses then if cached_addresses then
ngx.log(ngx.INFO, string.format("addresses %s for host %s was resolved from cache", table.concat(cached_addresses, ", "), host)) local message = string.format(
"addresses %s for host %s was resolved from cache",
table.concat(cached_addresses, ", "), host)
ngx.log(ngx.INFO, message)
return cached_addresses return cached_addresses
end end
local r, err = resolver:new{ local r
r, err = resolver:new{
nameservers = util.deepcopy(configuration.nameservers), nameservers = util.deepcopy(configuration.nameservers),
retrans = 5, retrans = 5,
timeout = 2000, -- 2 sec timeout = 2000, -- 2 sec
@ -46,7 +50,8 @@ function _M.resolve(host)
return { host } return { host }
end end
local answers, err, _tries = r:query(host, { qtype = r.TYPE_A }, {}) local answers
answers, err = r:query(host, { qtype = r.TYPE_A }, {})
if not answers then if not answers then
ngx.log(ngx.ERR, "failed to query the DNS server: " .. tostring(err)) ngx.log(ngx.ERR, "failed to query the DNS server: " .. tostring(err))
return { host } return { host }

2
rootfs/etc/nginx/template/nginx.tmpl
View file

@ -673,6 +673,8 @@ stream {
proxy_set_header X-Service-Name $service_name; proxy_set_header X-Service-Name $service_name;
proxy_set_header X-Service-Port $service_port; proxy_set_header X-Service-Port $service_port;
set $proxy_upstream_name "upstream-default-backend";
rewrite (.*) / break; rewrite (.*) / break;
{{ if $dynamicConfig }} {{ if $dynamicConfig }}