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

fix: support install blobfuse proxy on other linux distributions #1173

Merged
merged 1 commit into from
Dec 14, 2023

Conversation

cvvz
Copy link
Member

@cvvz cvvz commented Dec 14, 2023

What type of PR is this?
/kind bug

What this PR does / why we need it:
fix: support install blobfuse proxy on other linux distributions
Which issue(s) this PR fixes:

Fixes #1172

Requirements:

Special notes for your reviewer:
The installation scripts of mariner and ubuntu and any other Linux distributions basically have the same logical, so I use install-proxy.sh as the entry point for all the Linux distributions except for coreos.

Release note:

fix: support install blobfuse proxy on other linux distributions

@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 Dec 14, 2023
@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Dec 14, 2023
@cvvz
Copy link
Member Author

cvvz commented Dec 14, 2023

The installation scripts of mariner and ubuntu and any other Linux distributions basically have the same logical, so I use install-proxy.sh as the entry point of installing blobfuse-proxy for all the Linux distributions except for coreos.

@andyzhangx
Copy link
Member

/retest

@andyzhangx
Copy link
Member

@cvvz thanks for the quick fix! we did not realize that this csi driver is also used on other distros, in the future, I think we need to add some e2e tests or basic functional tests on other distros.

Copy link
Member

@andyzhangx andyzhangx left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 14, 2023
@k8s-ci-robot
Copy link
Contributor

[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

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

@andyzhangx andyzhangx merged commit 3e154f8 into kubernetes-sigs:master Dec 14, 2023
21 of 22 checks passed
@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 14, 2023
@andyzhangx
Copy link
Member

/cherrypick release-1.23

@andyzhangx
Copy link
Member

/cherrypick release-1.22

@andyzhangx
Copy link
Member

/cherrypick release-1.21

@k8s-infra-cherrypick-robot

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

Applying: fix: support install blobfuse proxy on other linux distributions
Using index info to reconstruct a base tree...
M	pkg/blobfuse-proxy/init.sh
A	pkg/blobfuse-proxy/install-proxy-mariner.sh
A	pkg/blobfuse-proxy/install-proxy-ubuntu.sh
M	pkg/blobplugin/Dockerfile
Falling back to patching base and 3-way merge...
Auto-merging pkg/blobplugin/Dockerfile
CONFLICT (content): Merge conflict in pkg/blobplugin/Dockerfile
CONFLICT (rename/delete): pkg/blobfuse-proxy/install-proxy-ubuntu.sh deleted in HEAD and renamed to pkg/blobfuse-proxy/install-proxy.sh in fix: support install blobfuse proxy on other linux distributions. Version fix: support install blobfuse proxy on other linux distributions of pkg/blobfuse-proxy/install-proxy.sh left in tree.
Auto-merging pkg/blobfuse-proxy/init.sh
CONFLICT (content): Merge conflict in pkg/blobfuse-proxy/init.sh
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: support install blobfuse proxy on other linux distributions
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.

@k8s-infra-cherrypick-robot

@andyzhangx: new pull request created: #1174

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/test-infra repository.

@k8s-infra-cherrypick-robot

@andyzhangx: #1173 failed to apply on top of branch "release-1.21":

Applying: fix: support install blobfuse proxy on other linux distributions
Using index info to reconstruct a base tree...
M	pkg/blobfuse-proxy/init.sh
A	pkg/blobfuse-proxy/install-proxy-mariner.sh
A	pkg/blobfuse-proxy/install-proxy-ubuntu.sh
M	pkg/blobplugin/Dockerfile
Falling back to patching base and 3-way merge...
Auto-merging pkg/blobplugin/Dockerfile
CONFLICT (content): Merge conflict in pkg/blobplugin/Dockerfile
CONFLICT (rename/delete): pkg/blobfuse-proxy/install-proxy-ubuntu.sh deleted in HEAD and renamed to pkg/blobfuse-proxy/install-proxy.sh in fix: support install blobfuse proxy on other linux distributions. Version fix: support install blobfuse proxy on other linux distributions of pkg/blobfuse-proxy/install-proxy.sh left in tree.
Auto-merging pkg/blobfuse-proxy/init.sh
CONFLICT (content): Merge conflict in pkg/blobfuse-proxy/init.sh
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: support install blobfuse proxy on other linux distributions
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.21

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/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Something is off with blobfuse-proxy on 1.23.2 release
4 participants