Skip to content
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.

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

OADP-1830: Only create VSR if it does not exist for a VSB #15

Merged
merged 1 commit into from May 16, 2023

Conversation

eemcmullan
Copy link
Collaborator

Also fixes VSB created per VSC

@openshift-ci-robot
Copy link
Collaborator

openshift-ci-robot commented May 5, 2023

@eemcmullan: This pull request references OADP-1830 which is a valid jira issue.

In response to this:

Also fixes VSB created per VSC

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Spec: datamoverv1alpha1.VolumeSnapshotRestoreSpec{
ResticSecretRef: corev1.LocalObjectReference{
Name: vsb.Spec.ResticSecretRef.Name,
// check if VolumeSnaphotRestore CR exists for VolumeSnaoshotBackup
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// check if VolumeSnaphotRestore CR exists for VolumeSnaoshotBackup
// check if VolumeSnaphotRestore CR exists for VolumeSnapshotBackup

GenerateName: "vsb-",
Namespace: snapCont.Spec.VolumeSnapshotRef.Namespace,
Labels: map[string]string{
util.BackupNameLabel: backup.Name,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it be possible to add backup UID here?

backup.Name isn't going to cause any issues here but it would be helpful to be able to compare if backup CR in the cluster still applies to this VSB.

@openshift-ci
Copy link

openshift-ci bot commented May 16, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: eemcmullan, shubham-pampattiwar

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [eemcmullan,shubham-pampattiwar]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-robot openshift-merge-robot merged commit 5ac1841 into migtools:main May 16, 2023
3 checks passed
@shubham-pampattiwar
Copy link
Member

/cherry-pick oadp-1.2

@openshift-cherrypick-robot

@shubham-pampattiwar: #15 failed to apply on top of branch "oadp-1.2":

Applying: only create vsr if does not exist for vsb
Using index info to reconstruct a base tree...
M	internal/restore/volumesnapshotrestore_action.go
M	internal/util/labels_annotations.go
M	internal/util/util.go
Falling back to patching base and 3-way merge...
Auto-merging internal/util/util.go
Auto-merging internal/util/labels_annotations.go
Auto-merging internal/restore/volumesnapshotrestore_action.go
CONFLICT (content): Merge conflict in internal/restore/volumesnapshotrestore_action.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 only create vsr if does not exist for vsb
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick oadp-1.2

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@shubham-pampattiwar
Copy link
Member

/cherry-pick oadp-1.2

@openshift-cherrypick-robot

@shubham-pampattiwar: new pull request created: #18

In response to this:

/cherry-pick oadp-1.2

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants