From ad333ac4217f442b56a5dac8407617ba359e6e17 Mon Sep 17 00:00:00 2001
From: Shintaro Murakami <mrkm4ntr@gmail.com>
Date: Wed, 18 Sep 2019 12:36:18 +0900
Subject: [PATCH] Return error when failed to get storage class

---
 pkg/controller/volume/persistentvolume/util/BUILD   | 1 +
 pkg/controller/volume/persistentvolume/util/util.go | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkg/controller/volume/persistentvolume/util/BUILD b/pkg/controller/volume/persistentvolume/util/BUILD
index cc104a345ba..041d1003766 100644
--- a/pkg/controller/volume/persistentvolume/util/BUILD
+++ b/pkg/controller/volume/persistentvolume/util/BUILD
@@ -11,6 +11,7 @@ go_library(
         "//pkg/volume/util:go_default_library",
         "//staging/src/k8s.io/api/core/v1:go_default_library",
         "//staging/src/k8s.io/api/storage/v1:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library",
diff --git a/pkg/controller/volume/persistentvolume/util/util.go b/pkg/controller/volume/persistentvolume/util/util.go
index 93e377b506e..8eaedad7a1d 100644
--- a/pkg/controller/volume/persistentvolume/util/util.go
+++ b/pkg/controller/volume/persistentvolume/util/util.go
@@ -21,6 +21,7 @@ import (
 
 	"k8s.io/api/core/v1"
 	storage "k8s.io/api/storage/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
@@ -88,7 +89,10 @@ func IsDelayBindingMode(claim *v1.PersistentVolumeClaim, classLister storagelist
 
 	class, err := classLister.Get(className)
 	if err != nil {
-		return false, nil
+		if apierrors.IsNotFound(err) {
+			return false, nil
+		}
+		return false, err
 	}
 
 	if class.VolumeBindingMode == nil {