merge queue: embarking release-v3.13 (aa15e64) and #5032 together #5035
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
Signed-off-by: Rakshith R <[email protected]> (cherry picked from commit afc08c5)
This commit consolidates flatten logic checks for cloneDepth and snapshotLimit in PrepareVolumeForSnapshot. This allows the function to be called for both CreateSnapshot and CreateVolumeGroupSnapshot. Clone Depth check and flattening of grand parent image now occurs before creation of snapshot starts. This aligns better with how PVC-PVC clone and PVC-restore process occurs currently. Flattening the grandparent image once prevents flattening of every newly created snapshot. Snapshot in above para refers to k8s VolumeSnapshot (which is backed by a rbd image). Signed-off-by: Rakshith R <[email protected]> (cherry picked from commit 9936033)
Currently, CephCSI only uses listSnaps to determine number of snapshots on a RBD image and uses snapshot names as child image names to flatten them. But child images may have different name(in case of group snapshot) or they maybe in trash (deleted k8s VolSnapshot with alive restored PVC). The above problems are avoid by making use of both snap and child image lists. Signed-off-by: Rakshith R <[email protected]> (cherry picked from commit 09d848e)
Signed-off-by: Rakshith R <[email protected]> (cherry picked from commit 50b2a05)
|
/test ci/centos/upgrade-tests-cephfs |
|
/test ci/centos/upgrade-tests-rbd |
|
/test ci/centos/k8s-e2e-external-storage/1.29 |
|
/test ci/centos/k8s-e2e-external-storage/1.31 |
|
/test ci/centos/k8s-e2e-external-storage/1.30 |
|
/test ci/centos/mini-e2e-helm/k8s-1.29 |
|
/test ci/centos/mini-e2e-helm/k8s-1.31 |
|
/test ci/centos/mini-e2e/k8s-1.29 |
|
/test ci/centos/mini-e2e-helm/k8s-1.30 |
|
/test ci/centos/mini-e2e/k8s-1.31 |
|
/test ci/centos/mini-e2e/k8s-1.30 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
🎉 This pull request has been checked successfully and will be merged soon. 🎉
Branch release-v3.13 (aa15e64) and #5032 are embarked together for merge.
This pull request has been created by Mergify to speculatively check the mergeability of #5032.
You don't need to do anything. Mergify will close this pull request automatically when it is complete.
Required conditions of queue
defaultfor merge:#approved-reviews-by >= 1[🛡 GitHub branch protection]#changes-requested-reviews-by = 0[🛡 GitHub branch protection]base~=^(release-.+)$status-success=ci/centos/k8s-e2e-external-storage/1.29status-success=ci/centos/k8s-e2e-external-storage/1.30status-success=ci/centos/k8s-e2e-external-storage/1.31status-success=ci/centos/mini-e2e-helm/k8s-1.29status-success=ci/centos/mini-e2e-helm/k8s-1.30status-success=ci/centos/mini-e2e-helm/k8s-1.31status-success=ci/centos/mini-e2e/k8s-1.29status-success=ci/centos/mini-e2e/k8s-1.30status-success=ci/centos/mini-e2e/k8s-1.31status-success=ci/centos/upgrade-tests-cephfsstatus-success=ci/centos/upgrade-tests-rbdstatus-success=codespellstatus-success=go-teststatus-success=golangci-lintstatus-success=lint-extrasstatus-success=mod-checkstatus-success=multi-arch-buildstatus-success=uncommitted-code-checkbase=release-v3.12status-success=ci/centos/k8s-e2e-external-storage/1.29status-success=ci/centos/k8s-e2e-external-storage/1.30status-success=ci/centos/k8s-e2e-external-storage/1.31status-success=ci/centos/mini-e2e-helm/k8s-1.29status-success=ci/centos/mini-e2e-helm/k8s-1.30status-success=ci/centos/mini-e2e-helm/k8s-1.31status-success=ci/centos/mini-e2e/k8s-1.29status-success=ci/centos/mini-e2e/k8s-1.30status-success=ci/centos/mini-e2e/k8s-1.31status-success=ci/centos/upgrade-tests-cephfsstatus-success=ci/centos/upgrade-tests-rbdstatus-success=codespellstatus-success=go-teststatus-success=golangci-lintstatus-success=lint-extrasstatus-success=mod-checkstatus-success=multi-arch-buildbase=develstatus-success=ci/centos/k8s-e2e-external-storage/1.29status-success=ci/centos/k8s-e2e-external-storage/1.30status-success=ci/centos/k8s-e2e-external-storage/1.31status-success=ci/centos/mini-e2e-helm/k8s-1.29status-success=ci/centos/mini-e2e-helm/k8s-1.30status-success=ci/centos/mini-e2e-helm/k8s-1.31status-success=ci/centos/mini-e2e/k8s-1.29status-success=ci/centos/mini-e2e/k8s-1.30status-success=ci/centos/mini-e2e/k8s-1.31status-success=ci/centos/upgrade-tests-cephfsstatus-success=ci/centos/upgrade-tests-rbdstatus-success=codespellstatus-success=go-teststatus-success=golangci-lintstatus-success=lint-extrasstatus-success=mod-checkstatus-success=multi-arch-buildstatus-success=uncommitted-code-checkbase=ci/centosstatus-success=ci/centos/jjb-validatestatus-success=ci/centos/job-validationRequired conditions to stay in the queue:
#approved-reviews-by >= 1[🛡 GitHub branch protection]#changes-requested-reviews-by = 0[🛡 GitHub branch protection]