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

Re-add the ability to load certs from the config file.

Browse Source
This commit is contained in:
Brendan Burns 2014-10-01 17:10:07 -07:00
parent 19fac35349
commit c3d2517371
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/kubecfg/kubecfg.go
View File

@ -188,6 +188,15 @@ func main() {
} }
clientConfig.Username = auth.User clientConfig.Username = auth.User
clientConfig.Password = auth.Password clientConfig.Password = auth.Password
if auth.CAFile != "" {
clientConfig.CAFile = auth.CAFile
}
if auth.CertFile != "" {
clientConfig.CertFile = auth.CertFile
}
if auth.KeyFile != "" {
clientConfig.KeyFile = auth.KeyFile
}
} }
kubeClient, err := client.New(clientConfig) kubeClient, err := client.New(clientConfig)
if err != nil { if err != nil {

3
pkg/kubecfg/kubecfg.go
View File

@ -54,6 +54,9 @@ func promptForString(field string, r io.Reader) string {
type AuthInfo struct { type AuthInfo struct {
User string User string
Password string Password string
CAFile string
CertFile string
KeyFile string
} }
// LoadAuthInfo parses an AuthInfo object from a file path. It prompts user and creates file if it doesn't exist. // LoadAuthInfo parses an AuthInfo object from a file path. It prompts user and creates file if it doesn't exist.