Skip to content

K
k3s
Commit df5e9f8a authored by Dr. Stefan Schimanski's avatar Dr. Stefan Schimanski
Browse files
Options

Allow to override the pod config in CreateAndInitKubelet

parent 2c03c048
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 1 deletion
cmd/kubelet/app/server.go
View file @ df5e9f8a
...@@ -826,6 +826,7 @@ type KubeletConfig struct { ...@@ -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 ...@@ -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,
......
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