Merge pull request #107608 from marseel/fake_prober_in_kubemark

Use FakeProber in kubemark clusters

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(
+	if kubeDeps.ProbeManager != nil {
-		klet.statusManager,
+		klet.probeManager = kubeDeps.ProbeManager
-		klet.livenessManager,
+	} else {
-		klet.readinessManager,
+		klet.probeManager = prober.NewManager(
-		klet.startupManager,
+			klet.statusManager,
-		klet.runner,
+			klet.livenessManager,
-		kubeDeps.Recorder)
+			klet.readinessManager,
+			klet.startupManager,
+			klet.runner,
+			kubeDeps.Recorder)
+	}
 
 	tokenManager := token.NewManager(kubeDeps.KubeClient)
 

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,