From 1bd3f072fa7cff22cbab2e581ff1bbc6f2d7dcf4 Mon Sep 17 00:00:00 2001 From: Roman Bednar Date: Mon, 3 Apr 2023 11:32:07 +0200 Subject: [PATCH] stop ignoring storage class selection errors The GetDefaultClass() was fixed in scope of this issue: https://github.com/kubernetes/kubernetes/issues/110514 Before this change assignDefaultStorageClass() was ignoring errors from this function since it could mean there are multiple defaults - assign could safely continue and do nothing. This is no longer true because we always choose one from multiple defaults - any errors returned from GetDefaultClass() are real errors and should not be ignored. --- pkg/controller/volume/persistentvolume/pv_controller.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkg/controller/volume/persistentvolume/pv_controller.go b/pkg/controller/volume/persistentvolume/pv_controller.go index a58be28164e..ba25bdb7c44 100644 --- a/pkg/controller/volume/persistentvolume/pv_controller.go +++ b/pkg/controller/volume/persistentvolume/pv_controller.go @@ -955,10 +955,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