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

🐛 [release-1.6] fix(capd): remove hack for btrfs/zfs support #10192

Merged

Conversation

kranurag7
Copy link
Contributor

Ref: #8376 (comment)

Support for btrfs/zfs was upstreamed to kind in kubernetes-sigs/kind#1464, removing the need for us to hack support in ourselves.

Helps #8317

chore: PR feedback

Removes the now-unused function mountDevMapper(...)

chore: fix ci lint

fix: restore missing storage consts

chore: fix bad rebase

mountDevMapper() is unused

What this PR does / why we need it:

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

Support for btrfs/zfs was upstreamed to kind in kubernetes-sigs/kind#1464, removing the need
for us to hack support in ourselves.

Helps kubernetes-sigs#8317

chore: PR feedback

Removes the now-unused function mountDevMapper(...)

chore: fix ci lint

fix: restore missing storage consts

chore: fix bad rebase

mountDevMapper() is unused
@k8s-ci-robot k8s-ci-robot added this to the v1.6 milestone Feb 22, 2024
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Feb 22, 2024
@k8s-ci-robot k8s-ci-robot added do-not-merge/needs-area PR is missing an area label needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Feb 22, 2024
@k8s-ci-robot
Copy link
Contributor

Hi @kranurag7. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@kranurag7 kranurag7 changed the title fix(capd): remove hack for btrfs/zfs support 🐛 fix(capd): remove hack for btrfs/zfs support Feb 22, 2024
Copy link
Member

@chrischdi chrischdi left a comment

Choose a reason for hiding this comment

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

Are you sure we do not need this?

We have this here because kind has it too. CAPD does not really use kind under the hood (the function linked above)🤔

@kranurag7
Copy link
Contributor Author

Are you sure we do not need this?

I'm not sure about the content of the PR.

I'm dependent on CAPD and for now I'm using an image built from main branch manually. This is supposed to be there on release-1.6 branch so that we get it in patch releases but the cherry-picking was not successful.
Again, I'm not entirely sure about the content in this PR, I just cherry-picked the commit on release-1.6 branch.

@chrischdi
Copy link
Member

Ah, I did not recognize that this is a cherry pick 👍

Please mention that in the PR comment :-)

/retitle🐛 [release-1.6] fix(capd): remove hack for btrfs/zfs support

This is a manual cherry pick of #8376 (comment)

@k8s-ci-robot k8s-ci-robot changed the title 🐛 fix(capd): remove hack for btrfs/zfs support 🐛 [release-1.6] fix(capd): remove hack for btrfs/zfs support Feb 22, 2024
@chrischdi
Copy link
Member

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Feb 22, 2024
@vincepri
Copy link
Member

vincepri commented Mar 6, 2024

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: vincepri

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 Mar 6, 2024
Copy link
Member

@chrischdi chrischdi 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 Mar 6, 2024
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: d98e510e96a7a274a227ba90b72e173d73f02d2e

Copy link
Contributor

@killianmuldoon killianmuldoon left a comment

Choose a reason for hiding this comment

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

/area ?

@k8s-ci-robot
Copy link
Contributor

@killianmuldoon: The label(s) area/? cannot be applied, because the repository doesn't have them.

In response to this:

/area ?

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.

Copy link
Contributor

@killianmuldoon killianmuldoon left a comment

Choose a reason for hiding this comment

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

/area provider/infrastructure-docker

@k8s-ci-robot k8s-ci-robot added area/provider/infrastructure-docker Issues or PRs related to the docker infrastructure provider and removed do-not-merge/needs-area PR is missing an area label labels Mar 7, 2024
@k8s-ci-robot k8s-ci-robot merged commit a516a65 into kubernetes-sigs:release-1.6 Mar 7, 2024
34 of 35 checks passed
@kranurag7 kranurag7 deleted the kr/btrfs-cherry-pick branch March 7, 2024 08:29
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. area/provider/infrastructure-docker Issues or PRs related to the docker infrastructure provider cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. 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.

None yet

6 participants