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.

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

Jump to bottom

[CLOUDOPS-405] fix: revert cinder volume direct image copy #1916

Merged
merged 1 commit into from
Sep 26, 2024
Merged

[CLOUDOPS-405] fix: revert cinder volume direct image copy #1916

merged 1 commit into from
Sep 26, 2024

Conversation

ricolin
Copy link
Member

@ricolin ricolin commented Sep 24, 2024

This revert two patches from cinder image as they limit the use case to narrow scope. Revert until we have more proper approach for directly copy image and encrypt volume in RBD.

@ricolin
[CLOUDOPS-405] revert cinder volume direct image copy
cba1a36 
This revert two patches from cinder image as they limit the use case
to narrow scope. Revert until we have more proper approach for directly
copy image and encrypt volume in RBD.
@ricolin ricolin changed the title [CLOUDOPS-405] revert cinder volume direct image copy [CLOUDOPS-405] fix: revert cinder volume direct image copy Sep 24, 2024
@ricolin ricolin requested a review from mnaser September 26, 2024 13:36
@mnaser mnaser added the gate label Sep 26, 2024
@mnaser
Copy link
Member

mnaser commented Sep 26, 2024

/cherry-pick stable/2024.1

@vexxhost-bot
Copy link
Collaborator

@mnaser: once the present PR merges, I will cherry-pick it on top of stable/2024.1 in a new PR and assign it to you.

In response to this:

/cherry-pick stable/2024.1

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-sigs/prow repository.

@mnaser
Copy link
Member

mnaser commented Sep 26, 2024

/cherry-pick stable/2023.2

@vexxhost-bot
Copy link
Collaborator

@mnaser: once the present PR merges, I will cherry-pick it on top of stable/2023.2 in a new PR and assign it to you.

In response to this:

/cherry-pick stable/2023.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-sigs/prow repository.

@mnaser
Copy link
Member

mnaser commented Sep 26, 2024

/cherry-pick stable/2023.1

@vexxhost-bot
Copy link
Collaborator

@mnaser: once the present PR merges, I will cherry-pick it on top of stable/2023.1 in a new PR and assign it to you.

In response to this:

/cherry-pick stable/2023.1

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-sigs/prow repository.

@mnaser
Copy link
Member

mnaser commented Sep 26, 2024

/cherry-pick stable/zed

@vexxhost-bot
Copy link
Collaborator

@mnaser: once the present PR merges, I will cherry-pick it on top of stable/zed in a new PR and assign it to you.

In response to this:

/cherry-pick stable/zed

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-sigs/prow repository.

@atmosphere-ci atmosphere-ci bot merged commit 6c7c2f3 into main Sep 26, 2024
5 checks passed
@atmosphere-ci atmosphere-ci bot deleted the CLOUDOPS-405 branch September 26, 2024 15:31
@vexxhost-bot
Copy link
Collaborator

@mnaser: new pull request created: #1922

In response to this:

/cherry-pick stable/2023.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-sigs/prow repository.

@vexxhost-bot vexxhost-bot mentioned this pull request Sep 26, 2024
Merged
@vexxhost-bot
Copy link
Collaborator

@mnaser: new pull request created: #1923

In response to this:

/cherry-pick stable/2023.1

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-sigs/prow repository.

@vexxhost-bot vexxhost-bot mentioned this pull request Sep 26, 2024
Merged
@vexxhost-bot
Copy link
Collaborator

@mnaser: #1916 failed to apply on top of branch "stable/zed":

Applying: revert cinder volume direct image copy
Using index info to reconstruct a base tree...
M	images/cinder/patches/cinder/0002-Allow-clone-encrypted-image-to-encrypted-volume.patch
M	images/cinder/patches/cinder/0003-Allow-encrypted-volume-clone-from-Glance-image.patch
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): images/cinder/patches/cinder/0003-Allow-encrypted-volume-clone-from-Glance-image.patch deleted in revert cinder volume direct image copy and modified in HEAD. Version HEAD of images/cinder/patches/cinder/0003-Allow-encrypted-volume-clone-from-Glance-image.patch left in tree.
CONFLICT (modify/delete): images/cinder/patches/cinder/0002-Allow-clone-encrypted-image-to-encrypted-volume.patch deleted in revert cinder volume direct image copy and modified in HEAD. Version HEAD of images/cinder/patches/cinder/0002-Allow-clone-encrypted-image-to-encrypted-volume.patch left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 revert cinder volume direct image copy
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 stable/zed

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-sigs/prow repository.

@vexxhost-bot
Copy link
Collaborator

@mnaser: new issue created for failed cherrypick: #1924

In response to this:

/cherry-pick stable/zed

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-sigs/prow repository.

@vexxhost-bot vexxhost-bot mentioned this pull request Sep 26, 2024
Closed
@vexxhost-bot
Copy link
Collaborator

@mnaser: new pull request created: #1925

In response to this:

/cherry-pick stable/2024.1

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-sigs/prow repository.

@vexxhost-bot vexxhost-bot mentioned this pull request Sep 26, 2024
Merged
yaguangtang pushed a commit that referenced this pull request Oct 1, 2024
@ricolin @yaguangtang
[CLOUDOPS-405] fix: revert cinder volume direct image copy (#1916)
3bb13a7 
This revert two patches from cinder image as they limit the use case to narrow scope. Revert until we have more proper approach for directly copy image and encrypt volume in RBD.
atmosphere-ci bot pushed a commit that referenced this pull request Oct 1, 2024
@vexxhost-bot
[stable/2024.1] [CLOUDOPS-405] fix: revert cinder volume direct image…
4196c93 
… copy (#1925)

This is an automated cherry-pick of #1916
/assign mnaser
atmosphere-ci bot pushed a commit that referenced this pull request Oct 1, 2024
@vexxhost-bot
[stable/2023.1] [CLOUDOPS-405] fix: revert cinder volume direct image…
bd62037 
… copy (#1923)

This is an automated cherry-pick of #1916
/assign mnaser
atmosphere-ci bot pushed a commit that referenced this pull request Oct 1, 2024
@vexxhost-bot
[stable/2023.2] [CLOUDOPS-405] fix: revert cinder volume direct image…
5bf91e6 
… copy (#1922)

This is an automated cherry-pick of #1916
/assign mnaser
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mnaser mnaser Awaiting requested review from mnaser

Assignees
No one assigned
Labels
gate
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ricolin @mnaser @vexxhost-bot