Skip to content

WIP: OCPBUGS-66967: UPSTREAM: 1354: Fix for cases where the resource is already present on the cluster #191

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
jsafrane wants to merge 1 commit into
base: master
Choose a base branch
from
+15 −4
Open

WIP: OCPBUGS-66967: UPSTREAM: 1354: Fix for cases where the resource is already present on the cluster #191

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 15 additions & 4 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 @@ -618,16 +618,27 @@ func (ctrl *csiSnapshotCommonController) createSnapshotsForGroupSnapshotContent(
volumeSnapshot.Spec.Source.PersistentVolumeClaimName = &emptyString
}

createdVolumeSnapshotContent, err := ctrl.clientset.SnapshotV1().VolumeSnapshotContents().Create(ctx, volumeSnapshotContent, metav1.CreateOptions{})
_, err = ctrl.clientset.SnapshotV1().VolumeSnapshotContents().Create(ctx, volumeSnapshotContent, metav1.CreateOptions{})
if err != nil && !apierrs.IsAlreadyExists(err) {
return groupSnapshotContent, fmt.Errorf(
"createSnapshotsForGroupSnapshotContent: creating 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
Expand Down Expand Up @@ -667,7 +678,7 @@ func (ctrl *csiSnapshotCommonController) createSnapshotsForGroupSnapshotContent(
// set the snapshot handle and the group snapshot handle
// inside the volume snapshot content to allow
// the CSI Snapshotter sidecar to reconcile its status
_, err = utils.PatchVolumeSnapshotContent(createdVolumeSnapshotContent, []utils.PatchOp{
_, err = utils.PatchVolumeSnapshotContent(volumeSnapshotContent, []utils.PatchOp{
{
Op: "replace",
Path: "/status",
Expand Down