Merge pull request #28539 from derekwaynecarr/credential_provider_timeout

Automatic merge from submit-queue Fix httpclient setup for gcp credential provider to have timeout The default http client has no timeout. This could cause problems when not on GCP environments. This PR changes to use a 10s timeout, and ensures the transport has our normal defaults applied. /cc @ncdc @liggitt

Merge pull request #28539 from derekwaynecarr/credential_provider_timeout
75689dd4 · k8s-merge-robot · GitHub · 64d185f5 · 5366bfe0 · 75689dd4
Commit 75689dd4 authored Jul 22, 2016 by k8s-merge-robot Committed by GitHub Jul 22, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 3 deletions

metadata.go pkg/credentialprovider/gcp/metadata.go +10 -3

No files found.
--- a/pkg/credentialprovider/gcp/metadata.go
+++ b/pkg/credentialprovider/gcp/metadata.go
@@ -25,6 +25,7 @@ import (

 	"github.com/golang/glog"
 	"k8s.io/kubernetes/pkg/credentialprovider"
+	utilnet "k8s.io/kubernetes/pkg/util/net"
 )

 const (
@@ -82,10 +83,16 @@ type containerRegistryProvider struct {
 // init registers the various means by which credentials may
 // be resolved on GCP.
 func init() {
+	tr := utilnet.SetTransportDefaults(&http.Transport{})
+	metadataHTTPClientTimeout := time.Second * 10
+	httpClient := &http.Client{
+		Transport: tr,
+		Timeout:   metadataHTTPClientTimeout,
+	}
 	credentialprovider.RegisterCredentialProvider("google-dockercfg",
 		&credentialprovider.CachingDockerConfigProvider{
 			Provider: &dockerConfigKeyProvider{
-				metadataProvider{Client: http.DefaultClient},
+				metadataProvider{Client: httpClient},
 			},
 			Lifetime: 60 * time.Second,
 		})
@@ -93,7 +100,7 @@ func init() {
 	credentialprovider.RegisterCredentialProvider("google-dockercfg-url",
 		&credentialprovider.CachingDockerConfigProvider{
 			Provider: &dockerConfigUrlKeyProvider{
-				metadataProvider{Client: http.DefaultClient},
+				metadataProvider{Client: httpClient},
 			},
 			Lifetime: 60 * time.Second,
 		})
@@ -102,7 +109,7 @@ func init() {
 		// Never cache this.  The access token is already
 		// cached by the metadata service.
 		&containerRegistryProvider{
-			metadataProvider{Client: http.DefaultClient},
+			metadataProvider{Client: httpClient},
 		})
 }