Merge pull request #49125 from abgworrall/handle-gke-clusters

Automatic merge from submit-queue (batch tested with PRs 47509, 46821, 45319, 49121, 49125) Tolerate a missing MasterName (for GKE) When testing, GKE created clusters don't provide a `MasterName`, so don't throw a warning and give up when that happens. ```release-note NONE ```

Merge pull request #49125 from abgworrall/handle-gke-clusters
c9f8c262 · Kubernetes Submit Queue · GitHub · c5b47482 · 14091e40 · c9f8c262
Commit c9f8c262 authored Jul 19, 2017 by Kubernetes Submit Queue Committed by GitHub Jul 19, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 6 deletions

google_compute.go test/e2e/framework/google_compute.go +9 -6

No files found.
--- a/test/e2e/framework/google_compute.go
+++ b/test/e2e/framework/google_compute.go
@@ -162,13 +162,16 @@ func lookupClusterImageSources() (string, string, error) {
 	frags := strings.Split(nodeImg, "/")
 	nodeImg = frags[len(frags)-1]

-	masterName := TestContext.CloudConfig.MasterName
-	masterImg, err := host2image(masterName)
-	if err != nil {
-		return "", "", err
+	// For GKE clusters, MasterName will not be defined; we just leave masterImg blank.
+	masterImg := ""
+	if masterName := TestContext.CloudConfig.MasterName; masterName != "" {
+		img, err := host2image(masterName)
+		if err != nil {
+			return "", "", err
+		}
+		frags = strings.Split(img, "/")
+		masterImg = frags[len(frags)-1]
 	}
-	frags = strings.Split(masterImg, "/")
-	masterImg = frags[len(frags)-1]

 	return masterImg, nodeImg, nil
 }