github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #45036 from apilloud/fix_resolvconf 

Automatic merge from submit-queue

resolv.conf nameserver line has only one entry, ignore trailing garbage

**What this PR does / why we need it**:

Per the resolv.conf man page "name servers may be  listed,  one  per  keyword." Some tools such as udhcpc take advantage of this to append comments to nameserver entries. For example: `nameserver 8.8.8.8 # eth0`. This updates the resolv.conf parser to ignore trailing garbage on nameserver lines.

**Release note**:
NONE
pull/6/head
Kubernetes Submit Queue 2017-06-01 11:41:58 -07:00 committed by GitHub
parent 5943e83417 166a0e440d
commit 43dcf0f56c
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubelet/kubelet_network.go
View File

@ -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:]

1
pkg/kubelet/kubelet_network_test.go
View File

@ -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"}},