From 561e034ada08d9ab707227756a62a4da47cee10d Mon Sep 17 00:00:00 2001
From: Adam Reese <adam@reese.io>
Date: Tue, 17 Apr 2018 15:14:09 -0700
Subject: [PATCH] fix(kube): use correct object type in watch

fixes #3902

(cherry picked from commit 31ddd707e8f832c2ac429aa09284e196f1664ec6)
---
 pkg/kube/client.go | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/pkg/kube/client.go b/pkg/kube/client.go
index e4e2dc1bb..a6ed14997 100644
--- a/pkg/kube/client.go
+++ b/pkg/kube/client.go
@@ -47,7 +47,6 @@ import (
 	"k8s.io/client-go/tools/clientcmd"
 	batchinternal "k8s.io/kubernetes/pkg/apis/batch"
 	"k8s.io/kubernetes/pkg/apis/core"
-	"k8s.io/kubernetes/pkg/client/conditions"
 	"k8s.io/kubernetes/pkg/kubectl"
 	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 	"k8s.io/kubernetes/pkg/kubectl/resource"
@@ -686,13 +685,28 @@ func (c *Client) watchPodUntilComplete(timeout time.Duration, info *resource.Inf
 
 	c.Log("Watching pod %s for completion with timeout of %v", info.Name, timeout)
 	_, err = watch.Until(timeout, w, func(e watch.Event) (bool, error) {
-		return conditions.PodCompleted(e)
+		return isPodComplete(e)
 	})
 
 	return err
 }
 
-//get an kubernetes resources's relation pods
+func isPodComplete(event watch.Event) (bool, error) {
+	o, ok := event.Object.(*core.Pod)
+	if !ok {
+		return true, fmt.Errorf("expected a *core.Pod, got %T", event.Object)
+	}
+	if event.Type == watch.Deleted {
+		return false, fmt.Errorf("pod not found")
+	}
+	switch o.Status.Phase {
+	case core.PodFailed, core.PodSucceeded:
+		return true, nil
+	}
+	return false, nil
+}
+
+//get a kubernetes resources' relation pods
 // kubernetes resource used select labels to relate pods
 func (c *Client) getSelectRelationPod(info *resource.Info, objPods map[string][]core.Pod) (map[string][]core.Pod, error) {
 	if info == nil {