Closed andyzhangx closed 3 months ago
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: andyzhangx
The full list of commands accepted by this bot can be found here.
The pull request process is described here
/retest
/retest
/retest
/retest
/retest
/retest
/retest
@andyzhangx: The following tests failed, say /retest
to rerun all failed tests or /retest-required
to rerun all mandatory failed tests:
Test name | Commit | Details | Required | Rerun command |
---|---|---|---|---|
pull-azuredisk-csi-driver-e2e-capz-windows-2022 | 74dfd5fc2cd8918bc572c95385c58ccf5e3abd89 | link | true | /test pull-azuredisk-csi-driver-e2e-capz-windows-2022 |
pull-azuredisk-csi-driver-e2e-capz-vmssflex | 74dfd5fc2cd8918bc572c95385c58ccf5e3abd89 | link | true | /test pull-azuredisk-csi-driver-e2e-capz-vmssflex |
Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.
/cherrypick release-1.30
/cherrypick release-1.29
/cherrypick release-1.28
@andyzhangx: new pull request created: #2451
@andyzhangx: #2450 failed to apply on top of branch "release-1.29":
Applying: fix: create snapshot failure in edge zone
Applying: chore: add logs for edge zone setting
Using index info to reconstruct a base tree...
A pkg/azuredisk/azure_managedDiskController.go
M pkg/azuredisk/controllerserver.go
Falling back to patching base and 3-way merge...
Auto-merging vendor/sigs.k8s.io/cloud-provider-azure/pkg/provider/azure_managedDiskController.go
CONFLICT (content): Merge conflict in vendor/sigs.k8s.io/cloud-provider-azure/pkg/provider/azure_managedDiskController.go
Auto-merging pkg/azuredisk/controllerserver.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 chore: add logs for edge zone setting
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".
@andyzhangx: #2450 failed to apply on top of branch "release-1.28":
Applying: fix: create snapshot failure in edge zone
Applying: chore: add logs for edge zone setting
Using index info to reconstruct a base tree...
A pkg/azuredisk/azure_managedDiskController.go
M pkg/azuredisk/controllerserver.go
Falling back to patching base and 3-way merge...
Auto-merging vendor/sigs.k8s.io/cloud-provider-azure/pkg/provider/azure_managedDiskController.go
CONFLICT (content): Merge conflict in vendor/sigs.k8s.io/cloud-provider-azure/pkg/provider/azure_managedDiskController.go
Auto-merging pkg/azuredisk/controllerserver.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 chore: add logs for edge zone setting
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".
What type of PR is this? /kind bug
What this PR does / why we need it: fix: create snapshot failure in edge zone
Which issue(s) this PR fixes:
Fixes #
Requirements:
Special notes for your reviewer:
Release note: