Remove waitForPodReady check from PodRunner (#5427)

* Remove waitForPodReady out of PodRunner * Add waitForPodReady to copy_volume_data
kanisterio · Apr 17, 2019 · cfc4885 · cfc4885
1 parent ac72e67
commit cfc4885
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pkg/function/copy_volume_data.go b/pkg/function/copy_volume_data.go
@@ -64,6 +64,10 @@ func copyVolumeData(ctx context.Context, cli kubernetes.Interface, tp param.Temp
 
 func copyVolumeDataPodFunc(cli kubernetes.Interface, tp param.TemplateParams, namespace, mountPoint, targetPath, encryptionKey string) func(ctx context.Context, pod *v1.Pod) (map[string]interface{}, error) {
 	return func(ctx context.Context, pod *v1.Pod) (map[string]interface{}, error) {
+		// Wait for pod to reach running state
+		if err := kube.WaitForPodReady(ctx, cli, pod.Namespace, pod.Name); err != nil {
+			return nil, errors.Wrapf(err, "Failed while waiting for Pod %s to be ready", pod.Name)
+		}
 		// Get restic repository
 		if err := restic.GetOrCreateRepository(cli, namespace, pod.Name, pod.Spec.Containers[0].Name, targetPath, encryptionKey, tp.Profile); err != nil {
 			return nil, err

diff --git a/pkg/kube/pod_runner.go b/pkg/kube/pod_runner.go
@@ -39,9 +39,5 @@ func (p *PodRunner) Run(ctx context.Context, fn func(context.Context, *v1.Pod) (
 			defer DeletePod(context.Background(), p.cli, pod)
 		}
 	}()
-	// Wait for pod to reach running state
-	if err := WaitForPodReady(ctx, p.cli, pod.Namespace, pod.Name); err != nil {
-		return nil, errors.Wrapf(err, "Failed while waiting for Pod %s to be ready", pod.Name)
-	}
 	return fn(ctx, pod)
 }