mirror of
https://github.com/vmware-tanzu/velero.git
synced 2026-01-03 03:35:22 +00:00
07f30d06b9
When restoring resources with GenerateName, Kubernetes assigns the actual name after creation, but Velero only tracked the original name from the backup in itemKey. This caused volume information collection to fail when trying to fetch PVCs using the original name instead of the actual created name. Example: - Original PVC name from backup: "test-vm-disk-1" - Actual created PVC name: "test-vm-backup-2025-10-27-test-vm-disk-1-mdjkd" - Volume info tried to fetch: "test-vm-disk-1" → Failed with "not found" This affects any plugin or workflow using GenerateName during restore: - kubevirt-velero-plugin (VMFR use case with PVC collision avoidance) - Custom restore item actions using generateName - Secrets/ConfigMaps restored with generateName Changes: 1. Add createdName field to restoredItemStatus struct (pkg/restore/request.go) 2. Capture actual name from createdObj.GetName() (pkg/restore/restore.go:1520) 3. Use createdName in RestoredResourceList() when available (pkg/restore/request.go:93-95) This fix is backwards compatible: - createdName defaults to empty string - When empty, falls back to itemKey.name (original behavior) - Only populated for GenerateName resources where needed Fixes volume information collection errors like: "Failed to get PVC" error="persistentvolumeclaims \"<original-name>\" not found" Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com>
112 lines
3.4 KiB
Go
112 lines
3.4 KiB
Go
/*
|
|
Copyright The Velero Contributors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package restore
|
|
|
|
import (
|
|
"fmt"
|
|
"io"
|
|
"sort"
|
|
|
|
snapshotv1api "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumesnapshot/v1"
|
|
"github.com/sirupsen/logrus"
|
|
"k8s.io/apimachinery/pkg/runtime"
|
|
|
|
"github.com/vmware-tanzu/velero/internal/resourcemodifiers"
|
|
"github.com/vmware-tanzu/velero/internal/volume"
|
|
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
|
"github.com/vmware-tanzu/velero/pkg/itemoperation"
|
|
"github.com/vmware-tanzu/velero/pkg/util/kube"
|
|
)
|
|
|
|
const (
|
|
ItemRestoreResultCreated = "created"
|
|
ItemRestoreResultUpdated = "updated"
|
|
ItemRestoreResultFailed = "failed"
|
|
ItemRestoreResultSkipped = "skipped"
|
|
)
|
|
|
|
type itemKey struct {
|
|
resource string
|
|
namespace string
|
|
name string
|
|
}
|
|
|
|
func resourceKey(obj runtime.Object) string {
|
|
gvk := obj.GetObjectKind().GroupVersionKind()
|
|
return fmt.Sprintf("%s/%s", gvk.GroupVersion().String(), gvk.Kind)
|
|
}
|
|
|
|
type Request struct {
|
|
*velerov1api.Restore
|
|
|
|
Log logrus.FieldLogger
|
|
Backup *velerov1api.Backup
|
|
PodVolumeBackups []*velerov1api.PodVolumeBackup
|
|
VolumeSnapshots []*volume.Snapshot
|
|
BackupReader io.Reader
|
|
RestoredItems map[itemKey]restoredItemStatus
|
|
itemOperationsList *[]*itemoperation.RestoreOperation
|
|
ResourceModifiers *resourcemodifiers.ResourceModifiers
|
|
DisableInformerCache bool
|
|
CSIVolumeSnapshots []*snapshotv1api.VolumeSnapshot
|
|
BackupVolumeInfoMap map[string]volume.BackupVolumeInfo
|
|
RestoreVolumeInfoTracker *volume.RestoreVolumeInfoTracker
|
|
ResourceDeletionStatusTracker kube.ResourceDeletionStatusTracker
|
|
}
|
|
|
|
type restoredItemStatus struct {
|
|
action string
|
|
itemExists bool
|
|
createdName string // Actual name assigned by K8s for GenerateName resources
|
|
}
|
|
|
|
// GetItemOperationsList returns ItemOperationsList, initializing it if necessary
|
|
func (r *Request) GetItemOperationsList() *[]*itemoperation.RestoreOperation {
|
|
if r.itemOperationsList == nil {
|
|
list := []*itemoperation.RestoreOperation{}
|
|
r.itemOperationsList = &list
|
|
}
|
|
return r.itemOperationsList
|
|
}
|
|
|
|
// RestoredResourceList returns the list of restored resources grouped by the API
|
|
// Version and Kind
|
|
func (r *Request) RestoredResourceList() map[string][]string {
|
|
resources := map[string][]string{}
|
|
for i, item := range r.RestoredItems {
|
|
// Use createdName if available (GenerateName case), otherwise itemKey.name
|
|
name := i.name
|
|
if item.createdName != "" {
|
|
name = item.createdName
|
|
}
|
|
|
|
entry := name
|
|
if i.namespace != "" {
|
|
entry = fmt.Sprintf("%s/%s", i.namespace, name)
|
|
}
|
|
entry = fmt.Sprintf("%s(%s)", entry, item.action)
|
|
resources[i.resource] = append(resources[i.resource], entry)
|
|
}
|
|
|
|
// sort namespace/name entries for each GVK
|
|
for _, v := range resources {
|
|
sort.Strings(v)
|
|
}
|
|
|
|
return resources
|
|
}
|