alexlebens/external-snapshotter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1011 from Madhu-1/fix-size-vsc

Browse Source 
Add snapshot size to VSC created for VGS
This commit is contained in:
Kubernetes Prow Robot
2024-02-14 13:25:03 -08:00
committed by GitHub
parent dc1f86147e 5a7115d61d
commit 18241c34eb
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/sidecar-controller/groupsnapshot_helper.go
View File

@@ -477,6 +477,11 @@ func (ctrl *csiSnapshotSideCarController) createGroupSnapshotWrapper(groupSnapsh
if err != nil { if err != nil {
return groupSnapshotContent, err return groupSnapshotContent, err
} }
_, err = ctrl.updateSnapshotContentStatus(volumeSnapshotContent, snapshot.SnapshotId, snapshot.ReadyToUse, snapshot.CreationTime.AsTime().UnixNano(), snapshot.SizeBytes, groupSnapshotID)
if err != nil {
return groupSnapshotContent, err
}
} }
newGroupSnapshotContent, err := ctrl.updateGroupSnapshotContentStatus(groupSnapshotContent, groupSnapshotID, readyToUse, creationTime.UnixNano(), snapshotContentNames) newGroupSnapshotContent, err := ctrl.updateGroupSnapshotContentStatus(groupSnapshotContent, groupSnapshotID, readyToUse, creationTime.UnixNano(), snapshotContentNames)

6
pkg/sidecar-controller/snapshot_controller.go
View File

@@ -446,11 +446,13 @@ func (ctrl *csiSnapshotSideCarController) updateSnapshotContentStatus(
SnapshotHandle: &snapshotHandle, SnapshotHandle: &snapshotHandle,
ReadyToUse: &readyToUse, ReadyToUse: &readyToUse,
CreationTime: &createdAt, CreationTime: &createdAt,
RestoreSize: &size,
} }
if groupSnapshotID != "" { if groupSnapshotID != "" {
newStatus.VolumeGroupSnapshotHandle = &groupSnapshotID newStatus.VolumeGroupSnapshotHandle = &groupSnapshotID
} }
if size > 0 {
newStatus.RestoreSize = &size
}
updated = true updated = true
} else { } else {
newStatus = contentObj.Status.DeepCopy() newStatus = contentObj.Status.DeepCopy()
@@ -469,7 +471,7 @@ func (ctrl *csiSnapshotSideCarController) updateSnapshotContentStatus(
newStatus.CreationTime = &createdAt newStatus.CreationTime = &createdAt
updated = true updated = true
} }
if newStatus.RestoreSize == nil { if newStatus.RestoreSize == nil && size > 0 {
newStatus.RestoreSize = &size newStatus.RestoreSize = &size
updated = true updated = true
} }