fix: interface conversion error for pod event (#6863)

GoogleContainerTools · Nov 16, 2021 · d2e73f3 · d2e73f3
1 parent 519fb58
commit d2e73f3
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/pkg/skaffold/kubernetes/wait.go b/pkg/skaffold/kubernetes/wait.go
@@ -75,7 +75,10 @@ func isPodSucceeded(podName string) func(event *watch.Event) (bool, error) {
 		if event.Object == nil {
 			return false, nil
 		}
-		pod := event.Object.(*v1.Pod)
+		pod, isPod := event.Object.(*v1.Pod)
+		if !isPod {
+			return false, nil
+		}
 		if pod.Name != podName {
 			return false, nil
 		}

diff --git a/pkg/skaffold/kubernetes/wait_test.go b/pkg/skaffold/kubernetes/wait_test.go
@@ -22,6 +22,7 @@ import (
 	"time"
 
 	v1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/watch"
 	fakekubeclientset "k8s.io/client-go/kubernetes/fake"
 
@@ -49,6 +50,10 @@ func TestWaitForPodSucceeded(t *testing.T) {
 			timeout:     10 * time.Millisecond,
 			phases:      []v1.PodPhase{v1.PodRunning, v1.PodRunning, v1.PodRunning, v1.PodRunning, v1.PodRunning, v1.PodRunning},
 			shouldErr:   true,
+		}, {
+			description: "resilient to network issues",
+			timeout:     1 * time.Second,
+			phases:      []v1.PodPhase{v1.PodRunning, "", "", v1.PodSucceeded},
 		},
 	}
 
@@ -70,11 +75,18 @@ func TestWaitForPodSucceeded(t *testing.T) {
 				if fakeWatcher.IsStopped() {
 					break
 				}
-				fakeWatcher.Modify(&v1.Pod{
-					Status: v1.PodStatus{
-						Phase: phase,
-					},
-				})
+				switch phase {
+				case v1.PodPending, v1.PodRunning, v1.PodFailed, v1.PodSucceeded, v1.PodUnknown:
+					fakeWatcher.Modify(&v1.Pod{
+						Status: v1.PodStatus{
+							Phase: phase,
+						},
+					})
+				default:
+					fakeWatcher.Modify(&metav1.Status{
+						Status: "Failure",
+					})
+				}
 				time.Sleep(1 * time.Millisecond)
 			}
 			err := <-errChan