github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3347 from erictune/kclientarg

Browse Source 
Pass client into Kubelet.
This commit is contained in:
Tim Hockin 2015-01-08 19:53:34 -08:00
commit da8dc5360e
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/kubelet.go
View File

@ -33,6 +33,7 @@ import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/api" "github.com/GoogleCloudPlatform/kubernetes/pkg/api"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api/validation" "github.com/GoogleCloudPlatform/kubernetes/pkg/api/validation"
"github.com/GoogleCloudPlatform/kubernetes/pkg/capabilities" "github.com/GoogleCloudPlatform/kubernetes/pkg/capabilities"
"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
"github.com/GoogleCloudPlatform/kubernetes/pkg/client/record" "github.com/GoogleCloudPlatform/kubernetes/pkg/client/record"
"github.com/GoogleCloudPlatform/kubernetes/pkg/health" "github.com/GoogleCloudPlatform/kubernetes/pkg/health"
"github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/dockertools" "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/dockertools"
@ -64,6 +65,7 @@ func NewMainKubelet(
hostname string, hostname string,
dockerClient dockertools.DockerInterface, dockerClient dockertools.DockerInterface,
etcdClient tools.EtcdClient, etcdClient tools.EtcdClient,
kubeClient *client.Client,
rootDirectory string, rootDirectory string,
networkContainerImage string, networkContainerImage string,
resyncInterval time.Duration, resyncInterval time.Duration,

1
pkg/standalone/standalone.go
View File

@ -269,6 +269,7 @@ func createAndInitKubelet(kc *KubeletConfig, pc *config.PodConfig) (*kubelet.Kub
kc.Hostname, kc.Hostname,
kc.DockerClient, kc.DockerClient,
kc.EtcdClient, kc.EtcdClient,
kc.KubeClient,
kc.RootDirectory, kc.RootDirectory,
kc.NetworkContainerImage, kc.NetworkContainerImage,
kc.SyncFrequency, kc.SyncFrequency,