Skip to content

[WIP]Vgs flaky fix verify #193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Phaow wants to merge 2 commits into
base: master
Choose a base branch
from
+23 −7
Open

[WIP]Vgs flaky fix verify #193

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ec5b74
Merge pull request #1354 from black-dragon74/fix-empty-resources
k8s-ci-robot Dec 11, 2025
2034741
test: vgs flake fix
Phaow Dec 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 23 additions & 7 deletions pkg/common-controller/groupsnapshot_controller_helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,25 +619,41 @@ func (ctrl *csiSnapshotCommonController) createSnapshotsForGroupSnapshotContent(
}

createdVolumeSnapshotContent, err := ctrl.clientset.SnapshotV1().VolumeSnapshotContents().Create(ctx, volumeSnapshotContent, metav1.CreateOptions{})
if err != nil && !apierrs.IsAlreadyExists(err) {
if apierrs.IsAlreadyExists(err) {
createdVolumeSnapshotContent, err = ctrl.clientset.SnapshotV1().
VolumeSnapshotContents().
Get(ctx, volumeSnapshotContent.Name, metav1.GetOptions{})
}
if err != nil {
return groupSnapshotContent, fmt.Errorf(
"createSnapshotsForGroupSnapshotContent: creating volumesnapshotcontent %w", err)
"createSnapshotsForGroupSnapshotContent: error creating or fetching volumesnapshotcontent %w", err)
}

createdVolumeSnapshot, err := ctrl.clientset.SnapshotV1().VolumeSnapshots(volumeSnapshotNamespace).Create(ctx, volumeSnapshot, metav1.CreateOptions{})
if err != nil && !apierrs.IsAlreadyExists(err) {
if apierrs.IsAlreadyExists(err) {
createdVolumeSnapshot, err = ctrl.clientset.SnapshotV1().
VolumeSnapshots(volumeSnapshotNamespace).
Get(ctx, volumeSnapshot.Name, metav1.GetOptions{})
}
if err != nil {
return groupSnapshotContent, fmt.Errorf(
"createSnapshotsForGroupSnapshotContent: creating volumesnapshot %w", err)
"createSnapshotsForGroupSnapshotContent: error creating or fetching volumesnapshot %w", err)
}

// FIX for cases where the UID might be empty
if createdVolumeSnapshot.GetUID() == "" {
return groupSnapshotContent, fmt.Errorf(
"createSnapshotsForGroupSnapshotContent: created snapshot %s has an empty UID", createdVolumeSnapshot.Name)
}

// bind the volume snapshot content to the volume snapshot
// like a dynamically provisioned snapshot would do
volumeSnapshotContent.Spec.VolumeSnapshotRef.UID = createdVolumeSnapshot.UID
_, err = utils.PatchVolumeSnapshotContent(volumeSnapshotContent, []utils.PatchOp{
createdVolumeSnapshotContent.Spec.VolumeSnapshotRef.UID = createdVolumeSnapshot.UID
_, err = utils.PatchVolumeSnapshotContent(createdVolumeSnapshotContent, []utils.PatchOp{
{
Op: "replace",
Path: "/spec/volumeSnapshotRef/uid",
Value: volumeSnapshotContent.Spec.VolumeSnapshotRef.UID,
Value: createdVolumeSnapshotContent.Spec.VolumeSnapshotRef.UID,
},
}, ctrl.clientset)
if err != nil {
Expand Down