fix: not available step logs

engine/engine_impl.go

@@ -190,7 +190,7 @@ func (k *Kubernetes) Run(ctx context.Context, specv runtime.Spec, stepv runtime.
 			PodNamespace: podNamespace,
 			PodName:      podId,
 			KubeClient:   k.client,
-			Period:       20 * time.Second,
+			Period:       5 * time.Second,
 		})
 
 		log.Trace("PodWatcher started")
@@ -225,10 +225,9 @@ func (k *Kubernetes) Run(ctx context.Context, specv runtime.Spec, stepv runtime.
 		return
 	}
 
-	err = k.fetchLogs(ctx, spec, step, output)
-	if err != nil {
-		return
-	}
+	watcher.WaitContainerReStart(containerId)
+
+	k.fetchLogs(ctx, spec, step, output)
 
 	type containerResult struct {
 		code int

engine/podwatcher/container.go

@@ -78,8 +78,9 @@ type containerWatchInfo struct {
 
 	stepState stepState
 
-	exitCode int32
-	reason   string
+	exitCode     int32
+	reason       string
+	restartCount int
 
 	addedAt  time.Time
 	failedAt time.Time

engine/podwatcher/watcher.go

@@ -6,6 +6,7 @@ package podwatcher
 
 import (
 	"context"
+	"strconv"
 	"sync"
 	"time"
 
@@ -259,6 +260,8 @@ func (pw *PodWatcher) updateContainers(containers []containerInfo) {
 				s = stepStateRunning
 			}
 
+			c.restartCount = int(cs.restartCount)
+
 			if s == c.stepState && c.reason == cs.reason {
 				continue // step state unchanged
 			}
@@ -418,6 +421,32 @@ func (pw *PodWatcher) WaitContainerStart(containerId string) error {
 	return pw.waitForEvent(containerId, stepStateRunning)
 }
 
+// WaitContainerReStart waits until a container in the pod restarts.
+func (pw *PodWatcher) WaitContainerReStart(containerId string) bool {
+	logrus.
+		WithField("pod", pw.podName).
+		WithField("container", containerId).
+		Debug("PodWatcher: Waiting to be restated")
+	retries := 0
+	for retries < 60 {
+		if pw.containerMap[containerId].stepState != stepStateRunning {
+			return false
+		}
+		if pw.containerMap[containerId].restartCount > 0 {
+			return true
+		}
+		retries++
+		logrus.
+			WithField("pod", pw.podName).
+			WithField("container", containerId).
+			WithField("restart count", strconv.Itoa(pw.containerMap[containerId].restartCount)).
+			Debug("PodWatcher: Waiting to be restated")
+
+		<-time.After(time.Second * 5)
+	}
+	return false
+}
+
 // WaitContainerTerminated waits until a container in the pod is terminated.
 func (pw *PodWatcher) WaitContainerTerminated(containerId string) (int, error) {
 	err := pw.waitForEvent(containerId, stepStateFinished)