Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: install blobfuse 2.0.4 as default version #980

Merged
merged 1 commit into from
Jul 14, 2023

Conversation

andyzhangx
Copy link
Member

@andyzhangx andyzhangx commented Jul 14, 2023

What type of PR is this?
/kind feature

What this PR does / why we need it:
feat: install blobfuse 2.0.4 as default version

Which issue(s) this PR fixes:

Fixes #

Requirements:

Special notes for your reviewer:

Release note:

feat: install blobfuse 2.0.4 as default version

@k8s-ci-robot k8s-ci-robot added kind/feature Categorizes issue or PR as related to a new feature. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jul 14, 2023
@k8s-ci-robot
Copy link
Contributor

[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

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 14, 2023
@andyzhangx
Copy link
Member Author

/retest

@andyzhangx andyzhangx merged commit 42060c2 into kubernetes-sigs:master Jul 14, 2023
@andyzhangx
Copy link
Member Author

/cherrypick release-1.22

@k8s-infra-cherrypick-robot

@andyzhangx: #980 failed to apply on top of branch "release-1.22":

Applying: feat: install blobfuse 2.0.4 as default version
warning: Cannot merge binary files: charts/latest/blob-csi-driver-v0.0.0.tgz (HEAD vs. feat: install blobfuse 2.0.4 as default version)
Using index info to reconstruct a base tree...
M	README.md
M	charts/latest/blob-csi-driver-v0.0.0.tgz
M	charts/latest/blob-csi-driver/values.yaml
M	deploy/csi-blob-node.yaml
M	docs/csi-debug.md
Falling back to patching base and 3-way merge...
Auto-merging docs/csi-debug.md
CONFLICT (content): Merge conflict in docs/csi-debug.md
Auto-merging deploy/csi-blob-node.yaml
Auto-merging charts/latest/blob-csi-driver/values.yaml
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
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 feat: install blobfuse 2.0.4 as default version
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:

/cherrypick release-1.22

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/feature Categorizes issue or PR as related to a new feature. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants