github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Make kubelet builder customizable

Browse Source 
This is the preparation to remove a lot of duplicated code for kubelet
initialization in https://github.com/kubernetes/kubernetes/pull/13036.
This commit is contained in:
Dr. Stefan Schimanski 2015-09-23 11:19:39 +02:00
parent e330b1197e
commit cd760cc4ea
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/integration/integration.go
View File

@ -238,7 +238,7 @@ func startComponents(firstManifestURL, secondManifestURL string) (string, string
10*time.Second, /* SyncFrequency */ 10*time.Second, /* SyncFrequency */
40 /* MaxPods */) 40 /* MaxPods */)
kubeletapp.RunKubelet(kcfg, nil) kubeletapp.RunKubelet(kcfg)
// Kubelet (machine) // Kubelet (machine)
// Create a second kubelet so that the guestbook example's two redis slaves both // Create a second kubelet so that the guestbook example's two redis slaves both
// have a place they can schedule. // have a place they can schedule.
@ -270,7 +270,7 @@ func startComponents(firstManifestURL, secondManifestURL string) (string, string
40 /* MaxPods */) 40 /* MaxPods */)
kubeletapp.RunKubelet(kcfg, nil) kubeletapp.RunKubelet(kcfg)
return apiServer.URL, configFilePath return apiServer.URL, configFilePath
} }

6
cmd/kubelet/app/server.go
View File

@ -455,7 +455,7 @@ func (s *KubeletServer) Run(kcfg *KubeletConfig) error {
glog.Warning(err) glog.Warning(err)
} }
if err := RunKubelet(kcfg, nil); err != nil { if err := RunKubelet(kcfg); err != nil {
return err return err
} }
@ -663,7 +663,7 @@ func SimpleKubelet(client *client.Client,
// 2 Kubelet binary // 2 Kubelet binary
// 3 Standalone 'kubernetes' binary // 3 Standalone 'kubernetes' binary
// Eventually, #2 will be replaced with instances of #3 // Eventually, #2 will be replaced with instances of #3
func RunKubelet(kcfg *KubeletConfig, builder KubeletBuilder) error { func RunKubelet(kcfg *KubeletConfig) error {
kcfg.Hostname = nodeutil.GetHostname(kcfg.HostnameOverride) kcfg.Hostname = nodeutil.GetHostname(kcfg.HostnameOverride)
if len(kcfg.NodeName) == 0 { if len(kcfg.NodeName) == 0 {
@ -712,6 +712,7 @@ func RunKubelet(kcfg *KubeletConfig, builder KubeletBuilder) error {
credentialprovider.SetPreferredDockercfgPath(kcfg.RootDirectory) credentialprovider.SetPreferredDockercfgPath(kcfg.RootDirectory)
builder := kcfg.Builder
if builder == nil { if builder == nil {
builder = createAndInitKubelet builder = createAndInitKubelet
} }
@ -782,6 +783,7 @@ func makePodSourceConfig(kc *KubeletConfig) *config.PodConfig {
type KubeletConfig struct { type KubeletConfig struct {
Address net.IP Address net.IP
AllowPrivileged bool AllowPrivileged bool
Builder KubeletBuilder
CAdvisorInterface cadvisor.Interface CAdvisorInterface cadvisor.Interface
CgroupRoot string CgroupRoot string
Cloud cloudprovider.Interface Cloud cloudprovider.Interface

2
cmd/kubemark/hollow-node.go
View File

@ -130,7 +130,7 @@ func main() {
10*time.Second, /* SyncFrequency */ 10*time.Second, /* SyncFrequency */
40, /* MaxPods */ 40, /* MaxPods */
) )
kubeletapp.RunKubelet(kcfg, nil) kubeletapp.RunKubelet(kcfg)
select {} select {}
} }