Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
5366bfe0
Commit
5366bfe0
authored
Jul 06, 2016
by
derekwaynecarr
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix httpclient setup for gcp credential provider to have timeout
parent
c0579af6
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
3 deletions
+10
-3
metadata.go
pkg/credentialprovider/gcp/metadata.go
+10
-3
No files found.
pkg/credentialprovider/gcp/metadata.go
View file @
5366bfe0
...
@@ -24,6 +24,7 @@ import (
...
@@ -24,6 +24,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
(
...
@@ -74,10 +75,16 @@ type containerRegistryProvider struct {
...
@@ -74,10 +75,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
.
Default
Client
},
metadataProvider
{
Client
:
httpClient
},
},
},
Lifetime
:
60
*
time
.
Second
,
Lifetime
:
60
*
time
.
Second
,
})
})
...
@@ -85,7 +92,7 @@ func init() {
...
@@ -85,7 +92,7 @@ func init() {
credentialprovider
.
RegisterCredentialProvider
(
"google-dockercfg-url"
,
credentialprovider
.
RegisterCredentialProvider
(
"google-dockercfg-url"
,
&
credentialprovider
.
CachingDockerConfigProvider
{
&
credentialprovider
.
CachingDockerConfigProvider
{
Provider
:
&
dockerConfigUrlKeyProvider
{
Provider
:
&
dockerConfigUrlKeyProvider
{
metadataProvider
{
Client
:
http
.
Default
Client
},
metadataProvider
{
Client
:
httpClient
},
},
},
Lifetime
:
60
*
time
.
Second
,
Lifetime
:
60
*
time
.
Second
,
})
})
...
@@ -94,7 +101,7 @@ func init() {
...
@@ -94,7 +101,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
.
Default
Client
},
metadataProvider
{
Client
:
httpClient
},
})
})
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment