From 44e9f6175d316cde4af19f8d676365598a95b1ee Mon Sep 17 00:00:00 2001 From: Shiming Zhang Date: Wed, 14 Apr 2021 15:41:27 +0800 Subject: [PATCH 1/2] Fix test Signed-off-by: Shiming Zhang --- pkg/kubelet/prober/worker_test.go | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkg/kubelet/prober/worker_test.go b/pkg/kubelet/prober/worker_test.go index a1e6eaac665..55a96ae30d7 100644 --- a/pkg/kubelet/prober/worker_test.go +++ b/pkg/kubelet/prober/worker_test.go @@ -333,12 +333,6 @@ func expectContinue(t *testing.T, w *worker, c bool, msg string) { } } -func expectStop(t *testing.T, w *worker, c bool, msg string) { - if c { - t.Errorf("[%s - %s] Expected to stop, but did not", w.probeType, msg) - } -} - func resultsManager(m *manager, probeType probeType) results.Manager { switch probeType { case readiness: @@ -508,6 +502,6 @@ func TestStartupProbeDisabledByStarted(t *testing.T) { // startupProbe fails, but is disabled m.prober.exec = fakeExecProber{probe.Failure, nil} msg = "Started, probe failure, result success" - expectStop(t, w, w.doProbe(), msg) + expectContinue(t, w, w.doProbe(), msg) expectResult(t, w, results.Success, msg) } From 6defb3657ff2702a0e71d19442fde8196da33a7d Mon Sep 17 00:00:00 2001 From: Shiming Zhang Date: Wed, 14 Apr 2021 15:05:08 +0800 Subject: [PATCH 2/2] Fix startupProbe behaviour changed Signed-off-by: Shiming Zhang --- pkg/kubelet/prober/worker.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/kubelet/prober/worker.go b/pkg/kubelet/prober/worker.go index 7c6e907679e..f627a79d036 100644 --- a/pkg/kubelet/prober/worker.go +++ b/pkg/kubelet/prober/worker.go @@ -250,8 +250,9 @@ func (w *worker) doProbe() (keepGoing bool) { if c.Started != nil && *c.Started { // Stop probing for startup once container has started. + // we keep it running to make sure it will work for restarted container. if w.probeType == startup { - return false + return true } } else { // Disable other probes until container has started.