From 7fe7f8a542bfeec73c23ac4280cc3ec0cc57cb74 Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Sat, 7 Feb 2015 13:30:53 -0800 Subject: [PATCH] move pkg/kubelet/server to cmd/kubelet/app --- cmd/hyperkube/hyperkube.go | 2 +- cmd/integration/integration.go | 6 +++--- {pkg/kubelet/server => cmd/kubelet/app}/plugins.go | 2 +- {pkg/kubelet/server => cmd/kubelet/app}/server.go | 4 ++-- cmd/kubelet/kubelet.go | 4 ++-- cmd/kubernetes/kubernetes.go | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) rename {pkg/kubelet/server => cmd/kubelet/app}/plugins.go (99%) rename {pkg/kubelet/server => cmd/kubelet/app}/server.go (99%) diff --git a/cmd/hyperkube/hyperkube.go b/cmd/hyperkube/hyperkube.go index 877048bad38..9e925de8877 100644 --- a/cmd/hyperkube/hyperkube.go +++ b/cmd/hyperkube/hyperkube.go @@ -21,9 +21,9 @@ package main import ( "os" + kubelet "github.com/GoogleCloudPlatform/kubernetes/cmd/kubelet/app" "github.com/GoogleCloudPlatform/kubernetes/pkg/controllermanager" "github.com/GoogleCloudPlatform/kubernetes/pkg/hyperkube" - kubelet "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/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" diff --git a/cmd/integration/integration.go b/cmd/integration/integration.go index 0b27821130a..08b6eaecb02 100644 --- a/cmd/integration/integration.go +++ b/cmd/integration/integration.go @@ -32,6 +32,7 @@ import ( "sync" "time" + kubeletapp "github.com/GoogleCloudPlatform/kubernetes/cmd/kubelet/app" "github.com/GoogleCloudPlatform/kubernetes/pkg/api" "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" @@ -41,7 +42,6 @@ import ( nodeControllerPkg "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider/controller" replicationControllerPkg "github.com/GoogleCloudPlatform/kubernetes/pkg/controller" "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/dockertools" - kubeletServer "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/server" "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/volume/empty_dir" "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" "github.com/GoogleCloudPlatform/kubernetes/pkg/master" @@ -211,13 +211,13 @@ func startComponents(manifestURL string) (apiServerURL string) { // Kubelet (localhost) testRootDir := makeTempDirOrDie("kubelet_integ_1.") glog.Infof("Using %s as root dir for kubelet #1", testRootDir) - kubeletServer.SimpleRunKubelet(cl, nil, &fakeDocker1, machineList[0], testRootDir, manifestURL, "127.0.0.1", 10250, api.NamespaceDefault, empty_dir.ProbeVolumePlugins()) + kubeletapp.SimpleRunKubelet(cl, nil, &fakeDocker1, machineList[0], testRootDir, manifestURL, "127.0.0.1", 10250, api.NamespaceDefault, empty_dir.ProbeVolumePlugins()) // Kubelet (machine) // Create a second kubelet so that the guestbook example's two redis slaves both // have a place they can schedule. testRootDir = makeTempDirOrDie("kubelet_integ_2.") glog.Infof("Using %s as root dir for kubelet #2", testRootDir) - kubeletServer.SimpleRunKubelet(cl, nil, &fakeDocker2, machineList[1], testRootDir, "", "127.0.0.1", 10251, api.NamespaceDefault, empty_dir.ProbeVolumePlugins()) + kubeletapp.SimpleRunKubelet(cl, nil, &fakeDocker2, machineList[1], testRootDir, "", "127.0.0.1", 10251, api.NamespaceDefault, empty_dir.ProbeVolumePlugins()) return apiServer.URL } diff --git a/pkg/kubelet/server/plugins.go b/cmd/kubelet/app/plugins.go similarity index 99% rename from pkg/kubelet/server/plugins.go rename to cmd/kubelet/app/plugins.go index ceb573dce64..130e72f153d 100644 --- a/pkg/kubelet/server/plugins.go +++ b/cmd/kubelet/app/plugins.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package server +package app // This file exists to force the desired plugin implementations to be linked. import ( diff --git a/pkg/kubelet/server/server.go b/cmd/kubelet/app/server.go similarity index 99% rename from pkg/kubelet/server/server.go rename to cmd/kubelet/app/server.go index 0d35b789979..d61c424125c 100644 --- a/pkg/kubelet/server/server.go +++ b/cmd/kubelet/app/server.go @@ -14,8 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Package server makes it easy to create a kubelet server for various contexts. -package server +// Package app makes it easy to create a kubelet server for various contexts. +package app import ( "fmt" diff --git a/cmd/kubelet/kubelet.go b/cmd/kubelet/kubelet.go index a49c36af9f5..78bb915b62c 100644 --- a/cmd/kubelet/kubelet.go +++ b/cmd/kubelet/kubelet.go @@ -25,7 +25,7 @@ import ( "os" "runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/server" + "github.com/GoogleCloudPlatform/kubernetes/cmd/kubelet/app" "github.com/GoogleCloudPlatform/kubernetes/pkg/util" "github.com/GoogleCloudPlatform/kubernetes/pkg/version/verflag" @@ -34,7 +34,7 @@ import ( func main() { runtime.GOMAXPROCS(runtime.NumCPU()) - s := server.NewKubeletServer() + s := app.NewKubeletServer() s.AddFlags(pflag.CommandLine) util.InitFlags() diff --git a/cmd/kubernetes/kubernetes.go b/cmd/kubernetes/kubernetes.go index 3eaac111873..5528ab24330 100644 --- a/cmd/kubernetes/kubernetes.go +++ b/cmd/kubernetes/kubernetes.go @@ -28,6 +28,7 @@ import ( "runtime" "time" + kubeletapp "github.com/GoogleCloudPlatform/kubernetes/cmd/kubelet/app" "github.com/GoogleCloudPlatform/kubernetes/pkg/api" "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" @@ -36,7 +37,6 @@ import ( nodeControllerPkg "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider/controller" "github.com/GoogleCloudPlatform/kubernetes/pkg/controller" "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/dockertools" - kubeletServer "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/server" "github.com/GoogleCloudPlatform/kubernetes/pkg/master" "github.com/GoogleCloudPlatform/kubernetes/pkg/master/ports" "github.com/GoogleCloudPlatform/kubernetes/pkg/service" @@ -144,7 +144,7 @@ func startComponents(etcdClient tools.EtcdClient, cl *client.Client, addr net.IP runControllerManager(machineList, cl, *nodeMilliCPU, *nodeMemory) dockerClient := dockertools.ConnectToDockerOrDie(*dockerEndpoint) - kubeletServer.SimpleRunKubelet(cl, nil, dockerClient, machineList[0], "/tmp/kubernetes", "", "127.0.0.1", 10250, *masterServiceNamespace, kubeletServer.ProbeVolumePlugins()) + kubeletapp.SimpleRunKubelet(cl, nil, dockerClient, machineList[0], "/tmp/kubernetes", "", "127.0.0.1", 10250, *masterServiceNamespace, kubeletapp.ProbeVolumePlugins()) } func newApiClient(addr net.IP, port int) *client.Client {