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

chore: enable blobfuse-proxy by default in kubectl install #1630

Merged

Conversation

andyzhangx
Copy link
Member

What type of PR is this?
/kind cleanup

What this PR does / why we need it:
chore: enable blobfuse-proxy by default in kubectl install

Which issue(s) this PR fixes:

Fixes #

Requirements:

Special notes for your reviewer:

Release note:

none

@k8s-ci-robot k8s-ci-robot added kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Oct 11, 2024
@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 approved Indicates a PR has been approved by an approver from all required OWNERS files. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Oct 11, 2024
@k8s-ci-robot k8s-ci-robot requested review from cvvz and feiskyer October 11, 2024 14:26
@andyzhangx
Copy link
Member Author

/retest

2 similar comments
@andyzhangx
Copy link
Member Author

/retest

@andyzhangx
Copy link
Member Author

/retest

@andyzhangx andyzhangx merged commit fbbd762 into kubernetes-sigs:master Oct 12, 2024
21 of 22 checks passed
@andyzhangx
Copy link
Member Author

/cherrypick release-1.24

@andyzhangx
Copy link
Member Author

/cherrypick release-1.23

@andyzhangx
Copy link
Member Author

/cherrypick release-1.22

@k8s-infra-cherrypick-robot

@andyzhangx: new pull request created: #1631

In response to this:

/cherrypick release-1.23

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-sigs/prow repository.

@k8s-infra-cherrypick-robot

@andyzhangx: new pull request created: #1632

In response to this:

/cherrypick release-1.24

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-sigs/prow repository.

@k8s-infra-cherrypick-robot

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

Applying: chore: enable blobfuse-proxy by default in kubectl install
Applying: doc: support example pod running on arm64 node
Using index info to reconstruct a base tree...
A	deploy/example/cloning/nginx-pod-restored-cloning.yaml
M	deploy/example/nginx-blobfuse-inline-volume.yaml
M	deploy/example/nginx-pod-blob.yaml
M	deploy/example/statefulset-nfs.yaml
M	deploy/example/statefulset.yaml
Falling back to patching base and 3-way merge...
Auto-merging deploy/example/statefulset.yaml
Auto-merging deploy/example/statefulset-nfs.yaml
Auto-merging deploy/example/nginx-pod-blob.yaml
Auto-merging deploy/example/nginx-blobfuse-inline-volume.yaml
CONFLICT (modify/delete): deploy/example/cloning/nginx-pod-restored-cloning.yaml deleted in HEAD and modified in doc: support example pod running on arm64 node. Version doc: support example pod running on arm64 node of deploy/example/cloning/nginx-pod-restored-cloning.yaml left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0002 doc: support example pod running on arm64 node

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-sigs/prow 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/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. 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