Merge pull request kubernetes#83069 from fcgravalos/remove_trailing_dots_from_searches

remove trailing dots from the parsed searches from host resolv.conf

Author: k8s-ci-robot

pkg/kubelet/network/dns/dns.go

@@ -230,7 +230,11 @@ func parseResolvConf(reader io.Reader) (nameservers []string, searches []string,
 			}
 		}
 		if fields[0] == "search" {
-			searches = fields[1:]
+			// Normalise search fields so the same domain with and without trailing dot will only count once, to avoid hitting search validation limits.
+			searches = []string{}
+			for _, s := range fields[1:] {
+				searches = append(searches, strings.TrimSuffix(s, "."))
+			}
 		}
 		if fields[0] == "options" {
 			options = fields[1:]

pkg/kubelet/network/dns/dns_test.go

@@ -74,6 +74,7 @@ func TestParseResolvConf(t *testing.T) {
 		{"search ", []string{}, []string{}, []string{}, false}, // search empty
 		{"search foo", []string{}, []string{"foo"}, []string{}, false},
 		{"search foo bar", []string{}, []string{"foo", "bar"}, []string{}, false},
+		{"search foo. bar", []string{}, []string{"foo", "bar"}, []string{}, false},
 		{"search foo bar bat\n", []string{}, []string{"foo", "bar", "bat"}, []string{}, false},
 		{"search foo\nsearch bar", []string{}, []string{"bar"}, []string{}, false},
 		{"nameserver 1.2.3.4\nsearch foo bar", []string{"1.2.3.4"}, []string{"foo", "bar"}, []string{}, false},