maru feedback

Author: JonathanOppenheimer

tests/fixture/bootstrapmonitor/e2e/e2e_test.go

@@ -141,6 +141,9 @@ var _ = ginkgo.Describe("[Bootstrap Tester]", func() {
 		waitForPodCondition(tc, clientset, namespace, bootstrapPodName, corev1.PodReadyToStartContainers)
 		ginkgo.By(fmt.Sprintf("Created pod %s.%s", namespace, bootstrapPodName))
 
+		ginkgo.By(fmt.Sprintf("Waiting for the %q container to report deletion of its pod to prompt recreation with a digest-pinned image", initContainerName))
+		waitForLogOutput(tc, clientset, namespace, bootstrapPodName, initContainerName, bootstrapmonitor.PodDeletingMessage, "" /* wantImage */)
+
 		ginkgo.By("Waiting for the pod image to be updated to include an image digest")
 		var containerImage string
 		require.Eventually(func() bool {

tests/fixture/bootstrapmonitor/init.go

@@ -28,6 +28,7 @@ const (
 
 	BootstrapStartingMessage = "Starting bootstrap test"
 	BootstrapResumingMessage = "Resuming bootstrap test"
+	PodDeletingMessage       = "Deleting pod to trigger recreation with the digest-pinned image"
 )
 
 var (
@@ -76,7 +77,8 @@ func InitBootstrapTest(log logging.Logger, namespace string, podName string, nod
 		// The statefulset controller won't replace a pod that was never ready
 		// (init blocks readiness), so self-delete, and let the digest-pinned
 		// replacement make the start/resume decision.
-		log.Info("Deleting pod to trigger recreation with the digest-pinned image",
+		log.Info(PodDeletingMessage,
+			zap.String("image", masterImageDetails.Image),
 			zap.String("namespace", namespace),
 			zap.String("pod", podName),
 			zap.Duration("terminationTimeout", reapTimeout),