kubernetes-sigs / azurefile-csi-driver

Azure File CSI Driver
Apache License 2.0
158 stars 143 forks source link

cleanup: refactor fallback to sas token on azcopy copy command #2099

Closed umagnus closed 2 months ago

umagnus commented 2 months ago

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:

none
k8s-ci-robot commented 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.

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.
andyzhangx commented 2 months ago

/retest

k8s-ci-robot commented 2 months ago

[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

Needs approval from an approver in each of these files: - ~~[OWNERS](https://github.com/kubernetes-sigs/azurefile-csi-driver/blob/master/OWNERS)~~ [andyzhangx] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
andyzhangx commented 2 months ago

/cherrypick release-1.30

andyzhangx commented 2 months ago

/cherrypick release-1.29

k8s-infra-cherrypick-robot commented 2 months ago

@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".
In response to [this](https://github.com/kubernetes-sigs/azurefile-csi-driver/pull/2099#issuecomment-2347990861): >/cherrypick release-1.30 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.
k8s-infra-cherrypick-robot commented 2 months ago

@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".
In response to [this](https://github.com/kubernetes-sigs/azurefile-csi-driver/pull/2099#issuecomment-2347990923): >/cherrypick release-1.29 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.