Commit 166a0e44 authored by Andrew Pilloud's avatar Andrew Pilloud

resolv.conf nameserver line has only one entry

parent 120fd322
...@@ -229,8 +229,8 @@ func (kl *Kubelet) parseResolvConf(reader io.Reader) (nameservers []string, sear ...@@ -229,8 +229,8 @@ func (kl *Kubelet) parseResolvConf(reader io.Reader) (nameservers []string, sear
if len(fields) == 0 { if len(fields) == 0 {
continue continue
} }
if fields[0] == "nameserver" { if fields[0] == "nameserver" && len(fields) >= 2 {
nameservers = append(nameservers, fields[1:]...) nameservers = append(nameservers, fields[1])
} }
if fields[0] == "search" { if fields[0] == "search" {
searches = fields[1:] searches = fields[1:]
......
...@@ -91,6 +91,7 @@ func TestParseResolvConf(t *testing.T) { ...@@ -91,6 +91,7 @@ func TestParseResolvConf(t *testing.T) {
{"nameserver\t1.2.3.4", []string{"1.2.3.4"}, []string{}}, {"nameserver\t1.2.3.4", []string{"1.2.3.4"}, []string{}},
{"nameserver \t 1.2.3.4", []string{"1.2.3.4"}, []string{}}, {"nameserver \t 1.2.3.4", []string{"1.2.3.4"}, []string{}},
{"nameserver 1.2.3.4\nnameserver 5.6.7.8", []string{"1.2.3.4", "5.6.7.8"}, []string{}}, {"nameserver 1.2.3.4\nnameserver 5.6.7.8", []string{"1.2.3.4", "5.6.7.8"}, []string{}},
{"nameserver 1.2.3.4 #comment", []string{"1.2.3.4"}, []string{}},
{"search foo", []string{}, []string{"foo"}}, {"search foo", []string{}, []string{"foo"}},
{"search foo bar", []string{}, []string{"foo", "bar"}}, {"search foo bar", []string{}, []string{"foo", "bar"}},
{"search foo bar bat\n", []string{}, []string{"foo", "bar", "bat"}}, {"search foo bar bat\n", []string{}, []string{"foo", "bar", "bat"}},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment