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

Allow to override the pod config in CreateAndInitKubelet

Browse Source
This commit is contained in:
Dr. Stefan Schimanski
2015-09-23 13:05:36 +02:00
parent 2c03c04879
commit df5e9f8a4d
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -826,6 +826,7 @@ type KubeletConfig struct {
OOMAdjuster *oom.OOMAdjuster OOMAdjuster *oom.OOMAdjuster
OSInterface kubecontainer.OSInterface OSInterface kubecontainer.OSInterface
PodCIDR string PodCIDR string
PodConfig *config.PodConfig
PodInfraContainerImage string PodInfraContainerImage string
Port uint Port uint
ReadOnlyPort uint ReadOnlyPort uint
@@ -869,7 +870,10 @@ func CreateAndInitKubelet(kc *KubeletConfig) (k KubeletBootstrap, pc *config.Pod
KubeletEndpoint: api.DaemonEndpoint{Port: int(kc.Port)}, KubeletEndpoint: api.DaemonEndpoint{Port: int(kc.Port)},
} }
pc = makePodSourceConfig(kc) pc = kc.PodConfig
if pc == nil {
pc = makePodSourceConfig(kc)
}
k, err = kubelet.NewMainKubelet( k, err = kubelet.NewMainKubelet(
kc.Hostname, kc.Hostname,
kc.NodeName, kc.NodeName,