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

Add "SnapshotClass" to DataUploadResult (#10227)

Browse Source 
Add "SnapshotClass" to DataUploadResult

Signed-off-by: Wenkai Yin(尹文开) <yinw@vmware.com>
This commit is contained in:
Wenkai Yin(尹文开)
2026-08-11 15:48:31 +08:00
committed by GitHub
parent e354e7aec4
commit 8b7951426b
4 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changelogs/unreleased/10227-ywk253100
+1
View File
@@ -0,0 +1 @@
Add "SnapshotClass" to DataUploadResult
pkg/apis/velero/v2alpha1/data_upload_types.go
+4
View File
@@ -268,4 +268,8 @@ type DataUploadResult struct {
// FSType is the file system type of the volume.
// +optional
FSType string `json:"fsType,omitempty"`
// SnapshotClass is the name of the snapshot class that the volume snapshot is created with
// +optional
SnapshotClass string `json:"snapshotClass,omitempty"`
}
pkg/restore/actions/dataupload_retrieve_action.go
+3
View File
@@ -82,6 +82,9 @@ func (d *DataUploadRetrieveAction) Execute(input *velero.RestoreItemActionExecut
NodeOS: dataUpload.Status.NodeOS,
FSType: dataUpload.Spec.SourceFSType,
}
if dataUpload.Spec.CSISnapshot != nil {
dataUploadResult.SnapshotClass = dataUpload.Spec.CSISnapshot.SnapshotClass
}
jsonBytes, err := json.Marshal(dataUploadResult)
if err != nil {
pkg/restore/actions/dataupload_retrieve_action_test.go
+23
View File
@@ -66,6 +66,29 @@ func TestDataUploadRetrieveActionExectue(t *testing.T) {
},
expectedDataUploadResult: builder.ForConfigMap("velero", "").ObjectMeta(builder.WithGenerateName("testDU-"), builder.WithLabels(velerov1.PVCNamespaceNameLabel, "testNamespace.testPVC", velerov1.RestoreUIDLabel, "testingUID", velerov1.ResourceUsageLabel, string(velerov1.VeleroResourceUsageDataUploadResult))).Data("testingUID", `{"backupStorageLocation":"testLocation","snapshotID":"fake-id","sourceNamespace":"testNamespace","snapshotSize":1000}`).Result(),
},
{
name: "DataUploadRetrieve Action test with optional fields",
dataUpload: func() *velerov2alpha1.DataUpload {
du := builder.ForDataUpload("velero", "testDU").
SourceNamespace("testNamespace").
SourcePVC("testPVC").
SnapshotID("fake-id").
TotalBytes(1000).
DataMover("velero").
NodeOS("linux").
CSISnapshot(&velerov2alpha1.CSISnapshotSpec{SnapshotClass: "testClass"}).
Result()
du.Status.DataMoverResult = &map[string]string{"key": "value"}
du.Spec.SourceFSType = "ext4"
return du
}(),
restore: builder.ForRestore("velero", "testRestore").ObjectMeta(builder.WithUID("testingUID")).Backup("testBackup").Result(),
runtimeScheme: scheme,
veleroObjs: []runtime.Object{
builder.ForBackup("velero", "testBackup").StorageLocation("testLocation").Result(),
},
expectedDataUploadResult: builder.ForConfigMap("velero", "").ObjectMeta(builder.WithGenerateName("testDU-"), builder.WithLabels(velerov1.PVCNamespaceNameLabel, "testNamespace.testPVC", velerov1.RestoreUIDLabel, "testingUID", velerov1.ResourceUsageLabel, string(velerov1.VeleroResourceUsageDataUploadResult))).Data("testingUID", `{"backupStorageLocation":"testLocation","datamover":"velero","snapshotID":"fake-id","sourceNamespace":"testNamespace","dataMoverResult":{"key":"value"},"nodeOS":"linux","snapshotSize":1000,"fsType":"ext4","snapshotClass":"testClass"}`).Result(),
},
{
name: "Long source namespace and PVC name should also work",
dataUpload: builder.ForDataUpload("velero", "testDU").SourceNamespace("migre209d0da-49c7-45ba-8d5a-3e59fd591ec1").SourcePVC("kibishii-data-kibishii-deployment-0").Result(),