Skip to content

K
k3s
Commit 75689dd4 authored by k8s-merge-robot's avatar k8s-merge-robot Committed by GitHub
Browse files
Options

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
parents 64d185f5 5366bfe0
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 3 deletions
pkg/credentialprovider/gcp/metadata.go
View file @ 75689dd4
...@@ -25,6 +25,7 @@ import ( ...@@ -25,6 +25,7 @@ import (
"github.com/golang/glog" "github.com/golang/glog"
"k8s.io/kubernetes/pkg/credentialprovider" "k8s.io/kubernetes/pkg/credentialprovider"
utilnet "k8s.io/kubernetes/pkg/util/net"
) )
const ( const (
...@@ -82,10 +83,16 @@ type containerRegistryProvider struct { ...@@ -82,10 +83,16 @@ type containerRegistryProvider struct {
// init registers the various means by which credentials may // init registers the various means by which credentials may
// be resolved on GCP. // be resolved on GCP.
func init() { func init() {
tr := utilnet.SetTransportDefaults(&http.Transport{})
metadataHTTPClientTimeout := time.Second * 10
httpClient := &http.Client{
Transport: tr,
Timeout: metadataHTTPClientTimeout,
}
credentialprovider.RegisterCredentialProvider("google-dockercfg", credentialprovider.RegisterCredentialProvider("google-dockercfg",
&credentialprovider.CachingDockerConfigProvider{ &credentialprovider.CachingDockerConfigProvider{
Provider: &dockerConfigKeyProvider{ Provider: &dockerConfigKeyProvider{
metadataProvider{Client: http.DefaultClient}, metadataProvider{Client: httpClient},
}, },
Lifetime: 60 * time.Second, Lifetime: 60 * time.Second,
}) })
...@@ -93,7 +100,7 @@ func init() { ...@@ -93,7 +100,7 @@ func init() {
credentialprovider.RegisterCredentialProvider("google-dockercfg-url", credentialprovider.RegisterCredentialProvider("google-dockercfg-url",
&credentialprovider.CachingDockerConfigProvider{ &credentialprovider.CachingDockerConfigProvider{
Provider: &dockerConfigUrlKeyProvider{ Provider: &dockerConfigUrlKeyProvider{
metadataProvider{Client: http.DefaultClient}, metadataProvider{Client: httpClient},
}, },
Lifetime: 60 * time.Second, Lifetime: 60 * time.Second,
}) })
...@@ -102,7 +109,7 @@ func init() { ...@@ -102,7 +109,7 @@ func init() {
// Never cache this. The access token is already // Never cache this. The access token is already
// cached by the metadata service. // cached by the metadata service.
&containerRegistryProvider{ &containerRegistryProvider{
metadataProvider{Client: http.DefaultClient}, metadataProvider{Client: httpClient},
}) })
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment