Tolerate a missing MasterName (for GKE)

GKE created clusters don't provide a MasterName, so don't throw a warning and give up when that happens.

Tolerate a missing MasterName (for GKE)
14091e40 · Adam Worrall · 6b78eeca · 14091e40
Commit 14091e40 authored Jul 18, 2017 by Adam Worrall
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
 }