Closed umagnus closed 2 months ago
Hi @umagnus. Thanks for your PR.
I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test
on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.
Once the patch is verified, the new status will be reflected by the ok-to-test
label.
I understand the commands that are listed here.
/retest
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: andyzhangx, umagnus
The full list of commands accepted by this bot can be found here.
The pull request process is described here
/cherrypick release-1.30
/cherrypick release-1.29
@andyzhangx: #2099 failed to apply on top of branch "release-1.30":
Applying: refator fallback to sas token on azcopy copy command
Using index info to reconstruct a base tree...
M pkg/azurefile/azurefile.go
M pkg/azurefile/controllerserver.go
M pkg/azurefile/controllerserver_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/azurefile/controllerserver_test.go
Auto-merging pkg/azurefile/controllerserver.go
CONFLICT (content): Merge conflict in pkg/azurefile/controllerserver.go
Auto-merging pkg/azurefile/azurefile.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 refator fallback to sas token on azcopy copy command
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: #2099 failed to apply on top of branch "release-1.29":
Applying: refator fallback to sas token on azcopy copy command
Using index info to reconstruct a base tree...
M pkg/azurefile/azurefile.go
M pkg/azurefile/controllerserver.go
M pkg/azurefile/controllerserver_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/azurefile/controllerserver_test.go
CONFLICT (content): Merge conflict in pkg/azurefile/controllerserver_test.go
Auto-merging pkg/azurefile/controllerserver.go
CONFLICT (content): Merge conflict in pkg/azurefile/controllerserver.go
Auto-merging pkg/azurefile/azurefile.go
CONFLICT (content): Merge conflict in pkg/azurefile/azurefile.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 refator fallback to sas token on azcopy copy command
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 cleanup
What this PR does / why we need it:
cleanup: refactor fallback to sas token on azcopy copy command
Which issue(s) this PR fixes:
Fixes #
Requirements:
Special notes for your reviewer:
Release note: