Merge pull request #3316 from deads2k/deads-add-kubeconfig-file-properly

add kubeconfig file properly
This commit is contained in:
Jeff Lowdermilk
2015-01-08 13:50:52 -08:00
38 changed files with 2805 additions and 724 deletions

View File

@@ -212,7 +212,7 @@ func main() {
// TODO: don't specify http or https in Host, and infer that from auth options.
clientConfig.Host = "http://localhost:8080"
}
if client.IsConfigTransportTLS(clientConfig) {
if client.IsConfigTransportTLS(*clientConfig) {
auth, err := kubecfg.LoadClientAuthInfoOrPrompt(*authConfig, os.Stdin)
if err != nil {
glog.Fatalf("Error loading auth: %v", err)

View File

@@ -24,6 +24,6 @@ import (
)
func main() {
clientBuilder := clientcmd.NewBuilder(clientcmd.NewPromptingAuthLoader(os.Stdin))
clientBuilder := clientcmd.NewInteractiveClientConfig(clientcmd.Config{}, "", &clientcmd.ConfigOverrides{}, os.Stdin)
cmd.NewFactory(clientBuilder).Run(os.Stdout)
}