Merge pull request #22555 from yujuhong/revert_retries

pkg/credentialprovider/config.go

@@ -26,10 +26,8 @@ import (
 	"path/filepath"
 	"strings"
 	"sync"
-	"time"
 
 	"github.com/golang/glog"
-	"k8s.io/kubernetes/pkg/util/wait"
 )
 
 // DockerConfigJson represents ~/.docker/config.json file info
@@ -50,10 +48,6 @@ type DockerConfigEntry struct {
 	Email    string
 }
 
-const (
-	readURLTimeout = time.Second * 20
-)
-
 var (
 	preferredPathLock sync.Mutex
 	preferredPath     = ""
@@ -144,19 +138,6 @@ func (he *HttpError) Error() string {
 }
 
 func ReadUrl(url string, client *http.Client, header *http.Header) (body []byte, err error) {
-	retryInterval := time.Second
-	wait.PollImmediate(retryInterval, readURLTimeout, func() (bool, error) {
-		body, err = readUrl(url, client, header)
-		if err != nil {
-			glog.V(4).Infof("Error reading %q: %v", url, err)
-			return false, nil
-		}
-		return true, nil
-	})
-	return body, err
-}
-
-func readUrl(url string, client *http.Client, header *http.Header) (body []byte, err error) {
 	req, err := http.NewRequest("GET", url, nil)
 	if err != nil {
 		return nil, err

pkg/credentialprovider/gcp/metadata.go

@@ -77,7 +77,7 @@ func init() {
 	credentialprovider.RegisterCredentialProvider("google-dockercfg",
 		&credentialprovider.CachingDockerConfigProvider{
 			Provider: &dockerConfigKeyProvider{
-				metadataProvider{Client: &http.Client{Timeout: 10 * time.Second}},
+				metadataProvider{Client: http.DefaultClient},
 			},
 			Lifetime: 60 * time.Second,
 		})
@@ -85,7 +85,7 @@ func init() {
 	credentialprovider.RegisterCredentialProvider("google-dockercfg-url",
 		&credentialprovider.CachingDockerConfigProvider{
 			Provider: &dockerConfigUrlKeyProvider{
-				metadataProvider{Client: &http.Client{Timeout: 10 * time.Second}},
+				metadataProvider{Client: http.DefaultClient},
 			},
 			Lifetime: 60 * time.Second,
 		})
@@ -94,7 +94,7 @@ func init() {
 		// Never cache this.  The access token is already
 		// cached by the metadata service.
 		&containerRegistryProvider{
-			metadataProvider{Client: &http.Client{Timeout: 10 * time.Second}},
+			metadataProvider{Client: http.DefaultClient},
 		})
 }