From 8c2ff81ae0f8d5d2860533990d0240a33003500b Mon Sep 17 00:00:00 2001
From: Tim Hockin <thockin@google.com>
Date: Sat, 7 Feb 2015 13:55:35 -0800
Subject: [PATCH] move pkg/proxy/server to cmd/kube-proxy/app

---
 cmd/hyperkube/hyperkube.go                         | 2 +-
 {pkg/proxy/server => cmd/kube-proxy/app}/server.go | 6 +++---
 cmd/kube-proxy/proxy.go                            | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename {pkg/proxy/server => cmd/kube-proxy/app}/server.go (98%)

diff --git a/cmd/hyperkube/hyperkube.go b/cmd/hyperkube/hyperkube.go
index c0f50fe8289..b0f2c1a3d1c 100644
--- a/cmd/hyperkube/hyperkube.go
+++ b/cmd/hyperkube/hyperkube.go
@@ -21,10 +21,10 @@ package main
 import (
 	"os"
 
+	proxy "github.com/GoogleCloudPlatform/kubernetes/cmd/kube-proxy/app"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/controllermanager"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/hyperkube"
 	apiserver "github.com/GoogleCloudPlatform/kubernetes/pkg/master/server"
-	proxy "github.com/GoogleCloudPlatform/kubernetes/pkg/proxy/server"
 	sched "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/server"
 )
 
diff --git a/pkg/proxy/server/server.go b/cmd/kube-proxy/app/server.go
similarity index 98%
rename from pkg/proxy/server/server.go
rename to cmd/kube-proxy/app/server.go
index 55c11f69f5e..0ad82534af4 100644
--- a/pkg/proxy/server/server.go
+++ b/cmd/kube-proxy/app/server.go
@@ -14,9 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Package server does all of the work necessary to configure and run a
-// Kubernetes proxy process.
-package server
+// Package app does all of the work necessary to configure and run a
+// Kubernetes app process.
+package app
 
 import (
 	"net"
diff --git a/cmd/kube-proxy/proxy.go b/cmd/kube-proxy/proxy.go
index 5b1d1d2e626..12d3b49303d 100644
--- a/cmd/kube-proxy/proxy.go
+++ b/cmd/kube-proxy/proxy.go
@@ -21,7 +21,7 @@ import (
 	"os"
 	"runtime"
 
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/proxy/server"
+	"github.com/GoogleCloudPlatform/kubernetes/cmd/kube-proxy/app"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/version/verflag"
 
@@ -30,7 +30,7 @@ import (
 
 func main() {
 	runtime.GOMAXPROCS(runtime.NumCPU())
-	s := server.NewProxyServer()
+	s := app.NewProxyServer()
 	s.AddFlags(pflag.CommandLine)
 
 	util.InitFlags()