github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-03 02:07:38 +00:00
Code Issues Projects Releases Wiki Activity

Move 'pkg/standalone' package to 'pkg/kubelet/server'.

Browse Source 
This paves the way to hyperkube for the kubelet.
This commit is contained in:
Joe Beda
2015-02-02 10:32:31 -08:00
parent 0474c49b07
commit d96afdd645
5 changed files with 101 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/kubelet/kubelet.go
View File

@@ -30,8 +30,8 @@ import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/credentialprovider"
_ "github.com/GoogleCloudPlatform/kubernetes/pkg/healthz"
"github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet"
kubeletServer "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/server"
"github.com/GoogleCloudPlatform/kubernetes/pkg/master/ports"
"github.com/GoogleCloudPlatform/kubernetes/pkg/standalone"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
"github.com/GoogleCloudPlatform/kubernetes/pkg/version/verflag"
@@ -123,14 +123,14 @@ func main() {
glog.Info(err)
}
client, err := standalone.GetAPIServerClient(*authPath, apiServerList)
client, err := kubeletServer.GetAPIServerClient(*authPath, apiServerList)
if err != nil && len(apiServerList) > 0 {
glog.Warningf("No API client: %v", err)
}
credentialprovider.SetPreferredDockercfgPath(*rootDirectory)
kcfg := standalone.KubeletConfig{
kcfg := kubeletServer.KubeletConfig{
Address: address,
AllowPrivileged: *allowPrivileged,
HostnameOverride: *hostnameOverride,
@@ -159,7 +159,7 @@ func main() {
VolumePlugins: app.ProbeVolumePlugins(),
}
standalone.RunKubelet(&kcfg)
kubeletServer.RunKubelet(&kcfg)
// runs forever
select {}
}