From 6e98ce34caf123bd19b4e8a7ee5e0774a91b44d6 Mon Sep 17 00:00:00 2001
From: Jeff Lowdermlk <tiro.jeff.ml@gmail.com>
Date: Fri, 16 Jan 2015 13:19:43 -0800
Subject: [PATCH] Fix kubectl proxy

Port flag was being ignored. Fixed now.
---
 pkg/kubectl/cmd/proxy.go    | 4 ++--
 pkg/kubectl/proxy_server.go | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkg/kubectl/cmd/proxy.go b/pkg/kubectl/cmd/proxy.go
index f99f2bcee3c..920562a62ea 100644
--- a/pkg/kubectl/cmd/proxy.go
+++ b/pkg/kubectl/cmd/proxy.go
@@ -36,9 +36,9 @@ func (f *Factory) NewCmdProxy(out io.Writer) *cobra.Command {
 			clientConfig, err := f.ClientConfig(cmd)
 			checkErr(err)
 
-			server, err := kubectl.NewProxyServer(GetFlagString(cmd, "www"), clientConfig, port)
+			server, err := kubectl.NewProxyServer(GetFlagString(cmd, "www"), clientConfig)
 			checkErr(err)
-			glog.Fatal(server.Serve())
+			glog.Fatal(server.Serve(port))
 		},
 	}
 	cmd.Flags().StringP("www", "w", "", "Also serve static files from the given directory under the prefix /static")
diff --git a/pkg/kubectl/proxy_server.go b/pkg/kubectl/proxy_server.go
index 19833a90ce3..a92e0485c4f 100644
--- a/pkg/kubectl/proxy_server.go
+++ b/pkg/kubectl/proxy_server.go
@@ -29,12 +29,11 @@ import (
 // ProxyServer is a http.Handler which proxies Kubernetes APIs to remote API server.
 type ProxyServer struct {
 	httputil.ReverseProxy
-	Port int
 }
 
 // NewProxyServer creates and installs a new ProxyServer.
 // It automatically registers the created ProxyServer to http.DefaultServeMux.
-func NewProxyServer(filebase string, cfg *client.Config, port int) (*ProxyServer, error) {
+func NewProxyServer(filebase string, cfg *client.Config) (*ProxyServer, error) {
 	prefix := cfg.Prefix
 	if prefix == "" {
 		prefix = "/api"
@@ -52,9 +51,9 @@ func NewProxyServer(filebase string, cfg *client.Config, port int) (*ProxyServer
 	return proxy, nil
 }
 
-// Serve starts the server (http.DefaultServeMux) on TCP port 8001, loops forever.
-func (s *ProxyServer) Serve() error {
-	addr := fmt.Sprintf(":%d", s.Port)
+// Serve starts the server (http.DefaultServeMux) on given port, loops forever.
+func (s *ProxyServer) Serve(port int) error {
+	addr := fmt.Sprintf(":%d", port)
 	return http.ListenAndServe(addr, nil)
 }