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

Don't test metadata server connectivity from GCE Windows pods.

Browse Source 
Windows containers do not include a route to the GCE metadata server by
default. This check is causing the "DNS should provide DNS for the
cluster" test to fail for clusters with Windows nodes
(https://testgrid.k8s.io/sig-windows#gce-windows-master&width=20).

Tested that this works by running "DNS should provide DNS for the
cluster" against an e2e cluster with Windows nodes brought up on GCE.
This commit is contained in:
Peter Hornyack 2019-03-07 17:43:42 -08:00
parent 596a48dd64
commit c88085dff2
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. // Added due to #8512. This is critical for GCE and GKE deployments.
if framework.ProviderIs("gce", "gke") { if framework.ProviderIs("gce", "gke") {
namesToResolve = append(namesToResolve, "google.com") 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) wheezyProbeCmd, wheezyFileNames := createProbeCommand(namesToResolve, nil, "", "wheezy", f.Namespace.Name, framework.TestContext.ClusterDNSDomain)
jessieProbeCmd, jessieFileNames := createProbeCommand(namesToResolve, nil, "", "jessie", 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. // Added due to #8512. This is critical for GCE and GKE deployments.
if framework.ProviderIs("gce", "gke") { if framework.ProviderIs("gce", "gke") {
namesToResolve = append(namesToResolve, "google.com") 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) hostFQDN := fmt.Sprintf("%s.%s.%s.svc.cluster.local", dnsTestPodHostName, dnsTestServiceName, f.Namespace.Name)
hostEntries := []string{hostFQDN, dnsTestPodHostName} hostEntries := []string{hostFQDN, dnsTestPodHostName}