Merge pull request #3303 from zmerlynn/skip_skydns_test_on_gke

Skip TestClusterDNS on GKE (since DNS is disabled there)
pull/6/head
Zach Loafman 2015-01-07 21:45:28 -08:00
commit e421e6eecd
1 changed files with 9 additions and 0 deletions

View File

@ -447,6 +447,15 @@ func outputTAPSummary(infoList []TestInfo) {
// TestClusterDNS checks that cluster DNS works.
func TestClusterDNS(c *client.Client) bool {
// TODO:
// https://github.com/GoogleCloudPlatform/kubernetes/issues/3305
// (but even if it's fixed, this will need a version check for
// skewed version tests)
if os.Getenv("KUBERNETES_PROVIDER") == "gke" {
glog.Infof("skipping TestClusterDNS on gke")
return true
}
podClient := c.Pods(api.NamespaceDefault)
//TODO: Wait for skyDNS