github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 02:41:25 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
```
This commit is contained in:
Kubernetes Submit Queue 2017-07-19 16:16:32 -07:00 committed by GitHub
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, "/") frags := strings.Split(nodeImg, "/")
nodeImg = frags[len(frags)-1] nodeImg = frags[len(frags)-1]
masterName := TestContext.CloudConfig.MasterName // For GKE clusters, MasterName will not be defined; we just leave masterImg blank.
masterImg, err := host2image(masterName) masterImg := ""
if err != nil { if masterName := TestContext.CloudConfig.MasterName; masterName != "" {
return "", "", err 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 return masterImg, nodeImg, nil
} }