github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-12 20:57:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5827 from spothanis/master

Browse Source 
added cloud provider flag to kubelet
This commit is contained in:
Victor Marmol
2015-03-25 10:50:18 -07:00
parent c22d4c6b3f 1c06cde4c4
commit f7135b3dd4
5 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/kubelet/kubelet.go
View File

@@ -37,6 +37,7 @@ import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
"github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache"
"github.com/GoogleCloudPlatform/kubernetes/pkg/client/record"
"github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider"
"github.com/GoogleCloudPlatform/kubernetes/pkg/fields"
"github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/cadvisor"
kubecontainer "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/container"
@@ -137,7 +138,8 @@ func NewMainKubelet(
streamingConnectionIdleTimeout time.Duration,
recorder record.EventRecorder,
cadvisorInterface cadvisor.Interface,
imageGCPolicy ImageGCPolicy) (*Kubelet, error) {
imageGCPolicy ImageGCPolicy,
cloud cloudprovider.Interface) (*Kubelet, error) {
if rootDirectory == "" {
return nil, fmt.Errorf("invalid root directory %q", rootDirectory)
}
@@ -235,6 +237,7 @@ func NewMainKubelet(
containerGC: containerGC,
imageManager: imageManager,
statusManager: statusManager,
cloud: cloud,
}
klet.podManager = newBasicPodManager(klet.kubeClient)
@@ -351,6 +354,9 @@ type Kubelet struct {
// Syncs pods statuses with apiserver; also used as a cache of statuses.
statusManager *statusManager
//Cloud provider interface
cloud cloudprovider.Interface
}
// getRootDir returns the full path to the directory under which kubelet can