diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index 6bdb3b99c85..fb157bfc84b 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -232,6 +232,7 @@ type Dependencies struct { OOMAdjuster *oom.OOMAdjuster OSInterface kubecontainer.OSInterface PodConfig *config.PodConfig + ProbeManager prober.Manager Recorder record.EventRecorder Subpather subpath.Interface VolumePlugins []volume.VolumePlugin @@ -731,13 +732,17 @@ func NewMainKubelet(kubeCfg *kubeletconfiginternal.KubeletConfiguration, } } - klet.probeManager = prober.NewManager( - klet.statusManager, - klet.livenessManager, - klet.readinessManager, - klet.startupManager, - klet.runner, - kubeDeps.Recorder) + if kubeDeps.ProbeManager != nil { + klet.probeManager = kubeDeps.ProbeManager + } else { + klet.probeManager = prober.NewManager( + klet.statusManager, + klet.livenessManager, + klet.readinessManager, + klet.startupManager, + klet.runner, + kubeDeps.Recorder) + } tokenManager := token.NewManager(kubeDeps.KubeClient) diff --git a/pkg/kubemark/hollow_kubelet.go b/pkg/kubemark/hollow_kubelet.go index 3108f610c16..e3e35cecd00 100644 --- a/pkg/kubemark/hollow_kubelet.go +++ b/pkg/kubemark/hollow_kubelet.go @@ -34,6 +34,7 @@ import ( "k8s.io/kubernetes/pkg/kubelet/cadvisor" "k8s.io/kubernetes/pkg/kubelet/cm" containertest "k8s.io/kubernetes/pkg/kubelet/container/testing" + probetest "k8s.io/kubernetes/pkg/kubelet/prober/testing" kubetypes "k8s.io/kubernetes/pkg/kubelet/types" "k8s.io/kubernetes/pkg/util/oom" "k8s.io/kubernetes/pkg/volume" @@ -103,6 +104,7 @@ func NewHollowKubelet( d := &kubelet.Dependencies{ KubeClient: client, HeartbeatClient: heartbeatClient, + ProbeManager: probetest.FakeManager{}, RemoteRuntimeService: runtimeService, RemoteImageService: imageService, CAdvisorInterface: cadvisorInterface,