github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #75152 from pjh/gce-windows-dns-testfix

Browse Source 
Don't test metadata server connectivity from GCE Windows pods.
This commit is contained in:
Kubernetes Prow Robot 2019-03-08 00:54:02 -08:00 committed by GitHub
commit eaa78b88ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/e2e/network/dns.go
View File

@ -51,7 +51,11 @@ var _ = SIGDescribe("DNS", func() {
// Added due to #8512. This is critical for GCE and GKE deployments.
if framework.ProviderIs("gce", "gke") {
namesToResolve = append(namesToResolve, "google.com")
namesToResolve = append(namesToResolve, "metadata")
// Windows containers do not have a route to the GCE
// metadata server by default.
if !framework.NodeOSDistroIs("windows") {
namesToResolve = append(namesToResolve, "metadata")
}
}
wheezyProbeCmd, wheezyFileNames := createProbeCommand(namesToResolve, nil, "", "wheezy", f.Namespace.Name, framework.TestContext.ClusterDNSDomain)
jessieProbeCmd, jessieFileNames := createProbeCommand(namesToResolve, nil, "", "jessie", f.Namespace.Name, framework.TestContext.ClusterDNSDomain)
@ -74,7 +78,11 @@ var _ = SIGDescribe("DNS", func() {
// Added due to #8512. This is critical for GCE and GKE deployments.
if framework.ProviderIs("gce", "gke") {
namesToResolve = append(namesToResolve, "google.com")
namesToResolve = append(namesToResolve, "metadata")
// Windows containers do not have a route to the GCE
// metadata server by default.
if !framework.NodeOSDistroIs("windows") {
namesToResolve = append(namesToResolve, "metadata")
}
}
hostFQDN := fmt.Sprintf("%s.%s.%s.svc.cluster.local", dnsTestPodHostName, dnsTestServiceName, f.Namespace.Name)
hostEntries := []string{hostFQDN, dnsTestPodHostName}