Merge pull request #32021 from mikedanese/flake

Automatic merge from submit-queue retry oauth token fetch in gce cloudprovider Fixes https://github.com/kubernetes/kubernetes/issues/31560 The oauth client fetches a token on the initial request of that client. Let's warm the cache. cc @goltermann @lavalamp

Merge pull request #32021 from mikedanese/flake
1f70140c · Kubernetes Submit Queue · GitHub · 3d80709d · 1a3ff078 · 1f70140c
Commit 1f70140c authored Sep 03, 2016 by Kubernetes Submit Queue Committed by GitHub Sep 03, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 2 deletions

gce.go pkg/cloudprovider/providers/gce/gce.go +11 -2

No files found.
--- a/pkg/cloudprovider/providers/gce/gce.go
+++ b/pkg/cloudprovider/providers/gce/gce.go
@@ -28,8 +28,6 @@ import (
 	"strings"
 	"time"

-	"gopkg.in/gcfg.v1"
-
 	"k8s.io/kubernetes/pkg/api"
 	apiservice "k8s.io/kubernetes/pkg/api/service"
 	"k8s.io/kubernetes/pkg/api/unversioned"
@@ -48,6 +46,7 @@ import (
 	container "google.golang.org/api/container/v1"
 	"google.golang.org/api/googleapi"
 	"google.golang.org/cloud/compute/metadata"
+	"gopkg.in/gcfg.v1"
 )

 const (
@@ -326,6 +325,16 @@ func CreateGCECloud(projectID, region, zone string, managedZones []string, netwo
 		glog.Infof("Using existing Token Source %#v", tokenSource)
 	}

+	if err := wait.PollImmediate(5*time.Second, 30*time.Second, func() (bool, error) {
+		if _, err := tokenSource.Token(); err != nil {
+			glog.Errorf("error fetching initial token: %v", err)
+			return false, nil
+		}
+		return true, nil
+	}); err != nil {
+		return nil, err
+	}
+
 	client := oauth2.NewClient(oauth2.NoContext, tokenSource)
 	svc, err := compute.New(client)
 	if err != nil {