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

regression test for the issue fixed in #4543

Browse source
This commit is contained in:
Elvin Efendi 2019-09-10 10:00:21 -04:00
parent 63dfa2b77c
commit bbcf3dc625
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
rootfs/etc/nginx/lua/test/util/resolv_conf_test.lua
View file

@ -30,6 +30,7 @@ describe("resolv_conf", function()
# This is a comment # This is a comment
nameserver 10.96.0.10 nameserver 10.96.0.10
nameserver 10.96.0.99 nameserver 10.96.0.99
nameserver 2001:4860:4860::8888
search ingress-nginx.svc.cluster.local svc.cluster.local cluster.local search ingress-nginx.svc.cluster.local svc.cluster.local cluster.local
options ndots:5 options ndots:5
]===] ]===]
@ -37,7 +38,7 @@ options ndots:5
helpers.with_resolv_conf(conf, function() helpers.with_resolv_conf(conf, function()
local resolv_conf = require("util.resolv_conf") local resolv_conf = require("util.resolv_conf")
assert.are.same({ assert.are.same({
nameservers = { "10.96.0.10", "10.96.0.99" }, nameservers = { "10.96.0.10", "10.96.0.99", "[2001:4860:4860::8888]" },
search = { "ingress-nginx.svc.cluster.local", "svc.cluster.local", "cluster.local" }, search = { "ingress-nginx.svc.cluster.local", "svc.cluster.local", "cluster.local" },
ndots = 5, ndots = 5,
}, resolv_conf) }, resolv_conf)

3
rootfs/etc/nginx/lua/util/resolv_conf.lua
View file

@ -1,4 +1,5 @@
local ngx_re_split = require("ngx.re").split local ngx_re_split = require("ngx.re").split
local string_format = string.format
local ngx_log = ngx.log local ngx_log = ngx.log
local ngx_ERR = ngx.ERR local ngx_ERR = ngx.ERR
@ -52,7 +53,7 @@ local function parse_line(line)
if keyword == "nameserver" then if keyword == "nameserver" then
if not value:match("^%d+.%d+.%d+.%d+$") then if not value:match("^%d+.%d+.%d+.%d+$") then
value = string.format("[%s]", value) value = string_format("[%s]", value)
end end
nameservers[#nameservers + 1] = value nameservers[#nameservers + 1] = value
elseif keyword == "search" then elseif keyword == "search" then