Merge pull request txn2#117 from calmkart/master

FIX: waiting for pod runnning, watch event.Object bug
CodeCoil · Apr 21, 2020 · c46c6c9 · c46c6c9
2 parents 40d3afb + 5f059eb
commit c46c6c9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pkg/fwdport/fwdport.go b/pkg/fwdport/fwdport.go
@@ -299,10 +299,10 @@ func (pfo *PortForwardOpts) WaitForPodRunning(signalsChan chan struct{}) (*v1.Po
 	// watcher until the pod status is running
 	for {
 		event, ok := <-watcher.ResultChan()
-		if !ok {
+		if !ok || event.Type == "ERROR" {
 			break
 		}
-		if event.Object != nil {
+		if event.Object != nil && event.Type == "MODIFIED" {
 			changedPod := event.Object.(*v1.Pod)
 			if changedPod.Status.Phase == v1.PodRunning {
 				return changedPod, nil