fix: retry on errors when watching pods

pkg/skaffold/kubernetes/wait.go

@@ -32,6 +32,8 @@ import (
 	"k8s.io/apimachinery/pkg/watch"
 	"k8s.io/client-go/kubernetes"
 	corev1 "k8s.io/client-go/kubernetes/typed/core/v1"
+	"k8s.io/client-go/tools/cache"
+	watchtools "k8s.io/client-go/tools/watch"
 
 	"github.com/GoogleContainerTools/skaffold/v2/pkg/skaffold/output/log"
 )
@@ -61,7 +63,7 @@ func watchUntilTimeout(ctx context.Context, timeout time.Duration, w watch.Inter
 func WaitForPodSucceeded(ctx context.Context, pods corev1.PodInterface, podName string, timeout time.Duration) error {
 	log.Entry(ctx).Infof("Waiting for %s to be complete", podName)
 
-	w, err := pods.Watch(ctx, metav1.ListOptions{})
+	w, err := newPodsWatcher(ctx, pods)
 	if err != nil {
 		return fmt.Errorf("initializing pod watcher: %s", err)
 	}
@@ -101,7 +103,7 @@ func isPodSucceeded(podName string) func(event *watch.Event) (bool, error) {
 func WaitForPodInitialized(ctx context.Context, pods corev1.PodInterface, podName string) error {
 	log.Entry(ctx).Infof("Waiting for %s to be initialized", podName)
 
-	w, err := pods.Watch(ctx, metav1.ListOptions{})
+	w, err := newPodsWatcher(ctx, pods)
 	if err != nil {
 		return fmt.Errorf("initializing pod watcher: %s", err)
 	}
@@ -154,3 +156,16 @@ func WaitForDeploymentToStabilize(ctx context.Context, c kubernetes.Interface, n
 		return false, nil
 	})
 }
+
+func newPodsWatcher(ctx context.Context, pods corev1.PodInterface) (watch.Interface, error) {
+	initList, err := pods.List(ctx, metav1.ListOptions{})
+	if err != nil {
+		return nil, err
+	}
+
+	return watchtools.NewRetryWatcher(initList.GetResourceVersion(), &cache.ListWatch{
+		WatchFunc: func(listOptions metav1.ListOptions) (watch.Interface, error) {
+			return pods.Watch(ctx, listOptions)
+		},
+	})
+}

pkg/skaffold/kubernetes/wait_test.go

@@ -23,8 +23,10 @@ import (
 
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/watch"
 	fakekubeclientset "k8s.io/client-go/kubernetes/fake"
+	clienttesting "k8s.io/client-go/testing"
 
 	"github.com/GoogleContainerTools/skaffold/v2/testutil"
 )
@@ -62,6 +64,9 @@ func TestWaitForPodSucceeded(t *testing.T) {
 			pod := &v1.Pod{}
 			client := fakekubeclientset.NewSimpleClientset(pod)
 
+			client.PrependReactor("list", "pods", func(action clienttesting.Action) (handled bool, ret runtime.Object, err error) {
+				return true, &v1.PodList{ListMeta: metav1.ListMeta{ResourceVersion: "1"}}, nil
+			})
 			fakeWatcher := watch.NewRaceFreeFake()
 			client.PrependWatchReactor("*", testutil.SetupFakeWatcher(fakeWatcher))
 			fakePods := client.CoreV1().Pods("")
@@ -78,12 +83,18 @@ func TestWaitForPodSucceeded(t *testing.T) {
 				switch phase {
 				case v1.PodPending, v1.PodRunning, v1.PodFailed, v1.PodSucceeded, v1.PodUnknown:
 					fakeWatcher.Modify(&v1.Pod{
+						ObjectMeta: metav1.ObjectMeta{
+							ResourceVersion: "1",
+						},
 						Status: v1.PodStatus{
 							Phase: phase,
 						},
 					})
 				default:
 					fakeWatcher.Modify(&metav1.Status{
+						ListMeta: metav1.ListMeta{
+							ResourceVersion: "1",
+						},
 						Status: "Failure",
 					})
 				}