Skip to content

K
k3s
Commit da8dc536 authored by Tim Hockin's avatar Tim Hockin
Browse files
Options

Merge pull request #3347 from erictune/kclientarg

Pass client into Kubelet.
parents d2f84797 29d084c4
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
pkg/kubelet/kubelet.go
View file @ da8dc536
......@@ -33,6 +33,7 @@ import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api/validation"
"github.com/GoogleCloudPlatform/kubernetes/pkg/capabilities"
"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
"github.com/GoogleCloudPlatform/kubernetes/pkg/client/record"
"github.com/GoogleCloudPlatform/kubernetes/pkg/health"
"github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/dockertools"
......@@ -64,6 +65,7 @@ func NewMainKubelet(
hostname string,
dockerClient dockertools.DockerInterface,
etcdClient tools.EtcdClient,
kubeClient *client.Client,
rootDirectory string,
networkContainerImage string,
resyncInterval time.Duration,
......
pkg/standalone/standalone.go
View file @ da8dc536
......@@ -269,6 +269,7 @@ func createAndInitKubelet(kc *KubeletConfig, pc *config.PodConfig) (*kubelet.Kub
kc.Hostname,
kc.DockerClient,
kc.EtcdClient,
kc.KubeClient,
kc.RootDirectory,
kc.NetworkContainerImage,
kc.SyncFrequency,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment