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

fix issues introduced in #2804

Browse source
This commit is contained in:
Elvin Efendi 2018-07-26 14:00:31 -04:00
parent ed19dc3bc6
commit a2692ce946
2 changed files with 10 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)
}
if strings.Contains(body, "service") {
t.Errorf("unexpected service reference in JSON content: %v", body)
if !strings.Contains(body, "service") {
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)
local cached_addresses = cache:get(host)
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
end
local r, err = resolver:new{
local r
r, err = resolver:new{
nameservers = util.deepcopy(configuration.nameservers),
retrans = 5,
timeout = 2000, -- 2 sec
@ -46,7 +50,8 @@ function _M.resolve(host)
return { host }
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
ngx.log(ngx.ERR, "failed to query the DNS server: " .. tostring(err))
return { host }