Hollow-node should use separate client for heartbeats.

This commit is contained in:
Maciej Borsz
2019-07-08 15:37:16 +02:00
parent d771dfac3d
commit ed41078f05
3 changed files with 30 additions and 18 deletions

View File

@@ -48,19 +48,13 @@ type HollowKubelet struct {
}
func NewHollowKubelet(
nodeName string,
flags *options.KubeletFlags,
config *kubeletconfig.KubeletConfiguration,
client *clientset.Clientset,
heartbeatClient *clientset.Clientset,
cadvisorInterface cadvisor.Interface,
dockerClientConfig *dockershim.ClientConfig,
kubeletPort, kubeletReadOnlyPort int,
containerManager cm.ContainerManager,
maxPods int, podsPerCore int,
) *HollowKubelet {
// -----------------
// Static config
// -----------------
f, c := GetHollowKubeletConfig(nodeName, kubeletPort, kubeletReadOnlyPort, maxPods, podsPerCore)
containerManager cm.ContainerManager) *HollowKubelet {
// -----------------
// Injected objects
// -----------------
@@ -69,7 +63,7 @@ func NewHollowKubelet(
volumePlugins = append(volumePlugins, projected.ProbeVolumePlugins()...)
d := &kubelet.Dependencies{
KubeClient: client,
HeartbeatClient: client,
HeartbeatClient: heartbeatClient,
DockerClientConfig: dockerClientConfig,
CAdvisorInterface: cadvisorInterface,
Cloud: nil,
@@ -84,8 +78,8 @@ func NewHollowKubelet(
}
return &HollowKubelet{
KubeletFlags: f,
KubeletConfiguration: c,
KubeletFlags: flags,
KubeletConfiguration: config,
KubeletDeps: d,
}
}