github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-11 06:02:18 +00:00
Code Issues Projects Releases Wiki Activity

Handle auth files with BearerToken sections.

Browse Source
This commit is contained in:
Eric Tune
2014-10-20 13:49:24 -07:00
parent 71c6f8ee5c
commit 21dae01005
6 changed files with 39 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/kubectl/cmd/cmd.go
View File

@@ -171,6 +171,7 @@ func getKubeClient(cmd *cobra.Command) *client.Client {
config.CAFile = firstNonEmptyString(getFlagString(cmd, "certificate-authority"), authInfo.CAFile)
config.CertFile = firstNonEmptyString(getFlagString(cmd, "client-certificate"), authInfo.CertFile)
config.KeyFile = firstNonEmptyString(getFlagString(cmd, "client-key"), authInfo.KeyFile)
config.BearerToken = authInfo.BearerToken
// For config.Insecure, the command line ALWAYS overrides the authInfo
// file, regardless of its setting.
if insecureFlag := getFlagBoolPtr(cmd, "insecure-skip-tls-verify"); insecureFlag != nil {