move pkg/proxy/server to cmd/kube-proxy/app

duda · Feb 20, 2015 · 8c2ff81 · 8c2ff81
1 parent 9f14511
commit 8c2ff81
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git 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 → cmd/kube-proxy/app/server.go b/pkg/proxy/server/server.go → 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
@@ -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()