Remove ndots check as it doesn't apply to windows

This commit is contained in:
Lee Cattarin 2019-03-07 11:48:06 -08:00 committed by Patrick Lang
parent c0e079bb15
commit 9e0a1d20c4

View File

@ -48,16 +48,9 @@ var _ = SIGDescribe("DNS", func() {
ginkgo.By("Creating a pod with dnsPolicy=None and customized dnsConfig...") ginkgo.By("Creating a pod with dnsPolicy=None and customized dnsConfig...")
testUtilsPod := generateDNSUtilsPod() testUtilsPod := generateDNSUtilsPod()
testUtilsPod.Spec.DNSPolicy = v1.DNSNone testUtilsPod.Spec.DNSPolicy = v1.DNSNone
testNdotsValue := "2"
testUtilsPod.Spec.DNSConfig = &v1.PodDNSConfig{ testUtilsPod.Spec.DNSConfig = &v1.PodDNSConfig{
Nameservers: []string{testInjectedIP}, Nameservers: []string{testInjectedIP},
Searches: []string{testSearchPath}, Searches: []string{testSearchPath},
Options: []v1.PodDNSConfigOption{
{
Name: "ndots",
Value: &testNdotsValue,
},
},
} }
testUtilsPod, err := f.ClientSet.CoreV1().Pods(f.Namespace.Name).Create(testUtilsPod) testUtilsPod, err := f.ClientSet.CoreV1().Pods(f.Namespace.Name).Create(testUtilsPod)
framework.ExpectNoError(err) framework.ExpectNoError(err)
@ -88,7 +81,7 @@ var _ = SIGDescribe("DNS", func() {
if dnsRegex.MatchString(stdout) { if dnsRegex.MatchString(stdout) {
match := dnsRegex.FindString(stdout) match := dnsRegex.FindString(stdout)
if !strings.Contains(match, "ndots:2") { if !strings.Contains(match, testInjectedIP) {
framework.Failf("customized DNS options not found in ipconfig /all, got: %s", match) framework.Failf("customized DNS options not found in ipconfig /all, got: %s", match)
} }
} else { } else {