github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Make getKubeConfig public to allow it for external consumption

Browse Source
This commit is contained in:
Michal Fojtik 2014-11-11 16:02:39 +01:00
parent 30fcf24131
commit 0c76c44972
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -153,7 +153,9 @@ func getExplicitKubeNamespace(cmd *cobra.Command) (string, bool) {
return "", false return "", false
} }
func getKubeConfig(cmd *cobra.Command) *client.Config { // GetKubeConfig returns a config used for the Kubernetes client with CLI
// options parsed.
func GetKubeConfig(cmd *cobra.Command) *client.Config {
config := &client.Config{} config := &client.Config{}
var host string var host string
@ -203,7 +205,7 @@ func getKubeConfig(cmd *cobra.Command) *client.Config {
} }
func getKubeClient(cmd *cobra.Command) *client.Client { func getKubeClient(cmd *cobra.Command) *client.Client {
config := getKubeConfig(cmd) config := GetKubeConfig(cmd)
// The binary version. // The binary version.
matchVersion := GetFlagBool(cmd, "match-server-version") matchVersion := GetFlagBool(cmd, "match-server-version")

2
pkg/kubectl/cmd/proxy.go
View File

@ -32,7 +32,7 @@ func NewCmdProxy(out io.Writer) *cobra.Command {
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
port := GetFlagInt(cmd, "port") port := GetFlagInt(cmd, "port")
glog.Infof("Starting to serve on localhost:%d", port) glog.Infof("Starting to serve on localhost:%d", port)
server, err := kubectl.NewProxyServer(GetFlagString(cmd, "www"), getKubeConfig(cmd), port) server, err := kubectl.NewProxyServer(GetFlagString(cmd, "www"), GetKubeConfig(cmd), port)
checkErr(err) checkErr(err)
glog.Fatal(server.Serve()) glog.Fatal(server.Serve())
}, },