github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #117064 from RomanBednar/multiple-defaults

Browse Source 
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
parent 9325a57125 1bd3f072fa
commit a48bcc06fe
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/controller/volume/persistentvolume/pv_controller.go
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

2
pkg/volume/util/storageclass.go
View File

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