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

This commit is contained in:
Tim Hockin 2015-02-07 13:55:35 -08:00
parent 9f1451121d
commit 8c2ff81ae0
3 changed files with 6 additions and 6 deletions

View File

@ -21,10 +21,10 @@ package main
import ( import (
"os" "os"
proxy "github.com/GoogleCloudPlatform/kubernetes/cmd/kube-proxy/app"
"github.com/GoogleCloudPlatform/kubernetes/pkg/controllermanager" "github.com/GoogleCloudPlatform/kubernetes/pkg/controllermanager"
"github.com/GoogleCloudPlatform/kubernetes/pkg/hyperkube" "github.com/GoogleCloudPlatform/kubernetes/pkg/hyperkube"
apiserver "github.com/GoogleCloudPlatform/kubernetes/pkg/master/server" 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" sched "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/server"
) )

View File

@ -14,9 +14,9 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// Package server does all of the work necessary to configure and run a // Package app does all of the work necessary to configure and run a
// Kubernetes proxy process. // Kubernetes app process.
package server package app
import ( import (
"net" "net"

View File

@ -21,7 +21,7 @@ import (
"os" "os"
"runtime" "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/util"
"github.com/GoogleCloudPlatform/kubernetes/pkg/version/verflag" "github.com/GoogleCloudPlatform/kubernetes/pkg/version/verflag"
@ -30,7 +30,7 @@ import (
func main() { func main() {
runtime.GOMAXPROCS(runtime.NumCPU()) runtime.GOMAXPROCS(runtime.NumCPU())
s := server.NewProxyServer() s := app.NewProxyServer()
s.AddFlags(pflag.CommandLine) s.AddFlags(pflag.CommandLine)
util.InitFlags() util.InitFlags()