Closed cvvz closed 3 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
@andyzhangx: #1325 failed to apply on top of branch "release-1.24":
Applying: fix: support setting kubelet path for blobfuse-proxy endpoint
Applying: fix
warning: Cannot merge binary files: charts/latest/blob-csi-driver-v0.0.0.tgz (HEAD vs. fix)
Using index info to reconstruct a base tree...
M charts/latest/blob-csi-driver-v0.0.0.tgz
Falling back to patching base and 3-way merge...
Auto-merging charts/latest/blob-csi-driver-v0.0.0.tgz
CONFLICT (content): Merge conflict in charts/latest/blob-csi-driver-v0.0.0.tgz
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 fix
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".
@cvvz can you cherrypick to release-1.24? thanks.
What type of PR is this? /kind feature
What this PR does / why we need it:
Which issue(s) this PR fixes:
Fixes #1236
Requirements:
Special notes for your reviewer:
Release note: