From f7ae33c67c450fc3376bccfcef015960a4af70f0 Mon Sep 17 00:00:00 2001
From: Niels de Vos <ndevos@redhat.com>
Date: Tue, 13 Jul 2021 18:15:37 +0200
Subject: [PATCH] e2e: only call error check functions when err != nil

Signed-off-by: Niels de Vos <ndevos@redhat.com>
---
 e2e/pvc.go | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/e2e/pvc.go b/e2e/pvc.go
index 332c34be8..fb836a973 100644
--- a/e2e/pvc.go
+++ b/e2e/pvc.go
@@ -61,14 +61,14 @@ func createPVCAndvalidatePV(c kubernetes.Interface, pvc *v1.PersistentVolumeClai
 
 		pv, err = c.CoreV1().PersistentVolumes().Get(context.TODO(), pvc.Spec.VolumeName, metav1.GetOptions{})
 		if err != nil {
+			if isRetryableAPIError(err) {
+				return false, nil
+			}
+			if apierrs.IsNotFound(err) {
+				return false, nil
+			}
 			return false, fmt.Errorf("failed to get pv: %w", err)
 		}
-		if isRetryableAPIError(err) {
-			return false, nil
-		}
-		if apierrs.IsNotFound(err) {
-			return false, nil
-		}
 		err = e2epv.WaitOnPVandPVC(
 			c,
 			&framework.TimeoutContext{ClaimBound: timeout, PVBound: timeout},