Merge pull request #117064 from RomanBednar/multiple-defaults

storage class assignment should not ignore errors
This commit is contained in:
Kubernetes Prow Robot
2023-06-23 03:09:23 -07:00
committed by GitHub
2 changed files with 2 additions and 5 deletions

View File

@@ -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