github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-17 07:03:31 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1911 from erictune/token_client

Browse Source 
Handle auth files with BearerToken sections.
This commit is contained in:
Clayton Coleman
2014-10-21 14:08:42 -04:00
parent 093ded6435 21dae01005
commit fa4e186e54
6 changed files with 39 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/e2e/e2e.go
View File

@@ -88,6 +88,7 @@ func loadClientOrDie() *client.Client {
config.CAFile = auth.CAFile
config.CertFile = auth.CertFile
config.KeyFile = auth.KeyFile
config.BearerToken = auth.BearerToken
if auth.Insecure != nil {
config.Insecure = *auth.Insecure
}

3
cmd/kubecfg/kubecfg.go
View File

@@ -216,6 +216,9 @@ func main() {
if auth.KeyFile != "" {
clientConfig.KeyFile = auth.KeyFile
}
if auth.BearerToken != "" {
clientConfig.BearerToken = auth.BearerToken
}
if auth.Insecure != nil {
clientConfig.Insecure = *auth.Insecure
}