From 94d4bf12872da1f77a9ea363991b795a90014420 Mon Sep 17 00:00:00 2001
From: Ted Yu <yute@vmware.com>
Date: Fri, 4 Oct 2019 04:36:48 -0700
Subject: [PATCH] Return proper error message when BindPodVolumes fails

---
 pkg/controller/volume/scheduling/scheduler_binder.go | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkg/controller/volume/scheduling/scheduler_binder.go b/pkg/controller/volume/scheduling/scheduler_binder.go
index 3a6431d3aca..3831aa0d43e 100644
--- a/pkg/controller/volume/scheduling/scheduler_binder.go
+++ b/pkg/controller/volume/scheduling/scheduler_binder.go
@@ -348,10 +348,18 @@ func (b *volumeBinder) BindPodVolumes(assumedPod *v1.Pod) (err error) {
 		return err
 	}
 
-	return wait.Poll(time.Second, b.bindTimeout, func() (bool, error) {
+	err = wait.Poll(time.Second, b.bindTimeout, func() (bool, error) {
 		b, err := b.checkBindings(assumedPod, bindings, claimsToProvision)
 		return b, err
 	})
+	if err != nil {
+		pvcName := ""
+		if len(claimsToProvision) > 0 {
+			pvcName = claimsToProvision[0].Name
+		}
+		return fmt.Errorf("Failed to bind volumes: provisioning failed for PVC %q: %v", pvcName, err)
+	}
+	return nil
 }
 
 func getPodName(pod *v1.Pod) string {