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.

Sign up for GitHub

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

Jump to bottom

fix: skip blobfuse-proxy copy if it's not enabled in driver init #1651

Merged
merged 1 commit into from
Oct 22, 2024
Merged

fix: skip blobfuse-proxy copy if it's not enabled in driver init #1651

merged 1 commit into from
Oct 22, 2024

Conversation

andyzhangx
Copy link
Member

What type of PR is this?
/kind bug

What this PR does / why we need it:
fix: skip blobfuse-proxy copy if it's not enabled in driver init

Which issue(s) this PR fixes:

Fixes #1645

Requirements:

Special notes for your reviewer:

Release note:

fix: skip blobfuse-proxy copy if it's not enabled in driver init

@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Oct 21, 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 requested review from cvvz and feiskyer October 21, 2024 09:31
@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Oct 21, 2024
@andyzhangx
Copy link
Member Author

/retest

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

/cherrypick release-1.25

@andyzhangx
Copy link
Member Author

/cherrypick release-1.24

@andyzhangx
Copy link
Member Author

/cherrypick release-1.23

@k8s-infra-cherrypick-robot
Copy link

@andyzhangx: new pull request created: #1653

In response to this:

/cherrypick release-1.25

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
Copy link

@andyzhangx: #1651 failed to apply on top of branch "release-1.23":

Applying: fix: skip blobfuse-proxy copy if it's not enabled in driver init
Using index info to reconstruct a base tree...
M	pkg/blobfuse-proxy/install-proxy-rhcos.sh
M	pkg/blobfuse-proxy/install-proxy.sh
Falling back to patching base and 3-way merge...
Auto-merging pkg/blobfuse-proxy/install-proxy.sh
CONFLICT (content): Merge conflict in pkg/blobfuse-proxy/install-proxy.sh
Auto-merging pkg/blobfuse-proxy/install-proxy-rhcos.sh
CONFLICT (content): Merge conflict in pkg/blobfuse-proxy/install-proxy-rhcos.sh
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 0001 fix: skip blobfuse-proxy copy if it's not enabled in driver init

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
Copy link

@andyzhangx: new pull request created: #1654

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.

This was referenced Oct 22, 2024
Merged
Merged
@rainerleber rainerleber mentioned this pull request Oct 23, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cvvz cvvz Awaiting requested review from cvvz

@feiskyer feiskyer Awaiting requested review from feiskyer

Assignees
No one assigned
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/bug Categorizes issue or PR as related to a bug. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

CSI Driver installation failed because of ro /usr
3 participants
@andyzhangx @k8s-ci-robot @k8s-infra-cherrypick-robot