diff --git a/pkg/controller/volume/persistentvolume/pv_controller.go b/pkg/controller/volume/persistentvolume/pv_controller.go index a1c8c43968a..523f89197f5 100644 --- a/pkg/controller/volume/persistentvolume/pv_controller.go +++ b/pkg/controller/volume/persistentvolume/pv_controller.go @@ -951,10 +951,7 @@ func (ctrl *PersistentVolumeController) assignDefaultStorageClass(ctx context.Co class, err := util.GetDefaultClass(ctrl.classLister) if err != nil { - // It is safe to ignore errors here because it means we either could not list SCs or there is more than one default. - // TODO: do not ignore errors after this PR is merged: https://github.com/kubernetes/kubernetes/pull/110559 - logger.V(4).Info("Failed to get default storage class", "err", err) - return false, nil + return false, err } else if class == nil { logger.V(4).Info("Can not assign storage class to PersistentVolumeClaim: default storage class not found", "PVC", klog.KObj(claim)) return false, nil diff --git a/pkg/volume/util/storageclass.go b/pkg/volume/util/storageclass.go index d2098c25800..223eb9dc21c 100644 --- a/pkg/volume/util/storageclass.go +++ b/pkg/volume/util/storageclass.go @@ -64,7 +64,7 @@ func GetDefaultClass(lister storagev1listers.StorageClassLister) (*storagev1.Sto return defaultClasses[i].CreationTimestamp.UnixNano() > defaultClasses[j].CreationTimestamp.UnixNano() }) if len(defaultClasses) > 1 { - klog.V(4).Infof("%d default StorageClasses were found, choosing the newest: %s", len(defaultClasses), defaultClasses[0].Name) + klog.V(4).Infof("%d default StorageClasses were found, choosing: %s", len(defaultClasses), defaultClasses[0].Name) } return defaultClasses[0], nil