Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "Set timeout for accessing credential provider's URL" #22555

Merged
merged 1 commit into from
Mar 4, 2016
Merged

Revert "Set timeout for accessing credential provider's URL" #22555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 0 additions & 19 deletions pkg/credentialprovider/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -50,10 +48,6 @@ type DockerConfigEntry struct {
Email string
}

const (
readURLTimeout = time.Second * 20
)

var (
preferredPathLock sync.Mutex
preferredPath = ""
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions pkg/credentialprovider/gcp/metadata.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,15 +77,15 @@ 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,
})

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,
})
Expand All @@ -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},
})
}

Expand Down