github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
```
pull/6/head
Kubernetes Submit Queue 2017-07-19 16:16:32 -07:00 committed by GitHub
parent c5b47482ae 14091e4043
commit c9f8c26209
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
test/e2e/framework/google_compute.go
View File

@ -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
}