From 166a0e440d477dff56e62857de03d1e4cd100c99 Mon Sep 17 00:00:00 2001 From: Andrew Pilloud Date: Thu, 27 Apr 2017 09:17:54 -0700 Subject: [PATCH] resolv.conf nameserver line has only one entry --- pkg/kubelet/kubelet_network.go | 4 ++-- pkg/kubelet/kubelet_network_test.go | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/kubelet/kubelet_network.go b/pkg/kubelet/kubelet_network.go index 57b5e58461..9dc5b95651 100644 --- a/pkg/kubelet/kubelet_network.go +++ b/pkg/kubelet/kubelet_network.go @@ -229,8 +229,8 @@ func (kl *Kubelet) parseResolvConf(reader io.Reader) (nameservers []string, sear if len(fields) == 0 { continue } - if fields[0] == "nameserver" { - nameservers = append(nameservers, fields[1:]...) + if fields[0] == "nameserver" && len(fields) >= 2 { + nameservers = append(nameservers, fields[1]) } if fields[0] == "search" { searches = fields[1:] diff --git a/pkg/kubelet/kubelet_network_test.go b/pkg/kubelet/kubelet_network_test.go index 3578800865..fecf63baee 100644 --- a/pkg/kubelet/kubelet_network_test.go +++ b/pkg/kubelet/kubelet_network_test.go @@ -91,6 +91,7 @@ func TestParseResolvConf(t *testing.T) { {"nameserver\t1.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 #comment", []string{"1.2.3.4"}, []string{}}, {"search foo", []string{}, []string{"foo"}}, {"search foo bar", []string{}, []string{"foo", "bar"}}, {"search foo bar bat\n", []string{}, []string{"foo", "bar", "bat"}},