mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-08-20 06:06:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't panic when storageClassName is not set in stateful sets

Browse Source 
Signed-off-by: divolgin <dmitriy@replicated.com>
This commit is contained in:
divolgin
2022-08-25 15:02:40 +00:00
parent e8494418d4
commit ad4e733ef2
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changelogs/unreleased/5247-divolgin
+1
View File
@@ -0,0 +1 @@
Fix nil pointer panic when restoring StatefulSets
pkg/restore/change_storageclass_action.go
+6 -6
View File
@@ -99,7 +99,7 @@ func (a *ChangeStorageClassAction) Execute(input *velero.RestoreItemActionExecut
if len(sts.Spec.VolumeClaimTemplates) > 0 { if len(sts.Spec.VolumeClaimTemplates) > 0 {
for index, pvc := range sts.Spec.VolumeClaimTemplates { for index, pvc := range sts.Spec.VolumeClaimTemplates {
exists, newStorageClass, err := a.isStorageClassExist(log, *pvc.Spec.StorageClassName, config) exists, newStorageClass, err := a.isStorageClassExist(log, pvc.Spec.StorageClassName, config)
if err != nil { if err != nil {
return nil, err return nil, err
} else if !exists { } else if !exists {
@@ -124,7 +124,7 @@ func (a *ChangeStorageClassAction) Execute(input *velero.RestoreItemActionExecut
return nil, errors.Wrap(err, "error getting item's spec.storageClassName") return nil, errors.Wrap(err, "error getting item's spec.storageClassName")
} }
exists, newStorageClass, err := a.isStorageClassExist(log, storageClass, config) exists, newStorageClass, err := a.isStorageClassExist(log, &storageClass, config)
if err != nil { if err != nil {
return nil, err return nil, err
} else if !exists { } else if !exists {
@@ -140,15 +140,15 @@ func (a *ChangeStorageClassAction) Execute(input *velero.RestoreItemActionExecut
return velero.NewRestoreItemActionExecuteOutput(obj), nil return velero.NewRestoreItemActionExecuteOutput(obj), nil
} }
func (a *ChangeStorageClassAction) isStorageClassExist(log *logrus.Entry, storageClass string, cm *corev1.ConfigMap) (exists bool, newStorageClass string, err error) { func (a *ChangeStorageClassAction) isStorageClassExist(log *logrus.Entry, storageClass *string, cm *corev1.ConfigMap) (exists bool, newStorageClass string, err error) {
if storageClass == "" { if storageClass == nil || *storageClass == "" {
log.Debug("Item has no storage class specified") log.Debug("Item has no storage class specified")
return false, "", nil return false, "", nil
} }
newStorageClass, ok := cm.Data[storageClass] newStorageClass, ok := cm.Data[*storageClass]
if !ok { if !ok {
log.Debugf("No mapping found for storage class %s", storageClass) log.Debugf("No mapping found for storage class %s", *storageClass)
return false, "", nil return false, "", nil
} }