Closed cvvz closed 6 months ago
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: andyzhangx, cvvz
The full list of commands accepted by this bot can be found here.
The pull request process is described here
/cherrypick release-1.24
/cherrypick release-1.23
@andyzhangx: #1318 failed to apply on top of branch "release-1.23":
Applying: fix: workload identity did not work
Using index info to reconstruct a base tree...
M pkg/blob/azure.go
M pkg/blob/azure_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/blob/azure_test.go
CONFLICT (content): Merge conflict in pkg/blob/azure_test.go
Auto-merging pkg/blob/azure.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 fix: workload identity did not work
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: new pull request created: #1319
@cvvz can you cherrypick this fix into release-1.23?
What type of PR is this? /kind bug
What this PR does / why we need it: The same fix as https://github.com/kubernetes-sigs/azuredisk-csi-driver/pull/2233
Which issue(s) this PR fixes:
Fixes #
Requirements:
Special notes for your reviewer: https://github.com/kubernetes-sigs/azuredisk-csi-driver/pull/2233
Release note: