🐛 remove duplicate fix for btrfs/zfs support

[cannonpalms]

If btrfs or zfs is used CAPD adds the /dev/mapper mount twice. This PR ensures we only do it once.

xref to where kind implements this: kubernetes-sigs/kind#1464

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 #8317

[linux-foundation-easycla]

The committers listed above are authorized under a signed CLA.

• ✅ login: cannonpalms / name: Cannon Palms (f6fa4ec)

[k8s-ci-robot]

Welcome @cannonpalms!

It looks like this is your first PR to kubernetes-sigs/cluster-api 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/cluster-api has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

[k8s-ci-robot]

Hi @cannonpalms. 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.

[fabriziopandini]

/hold
I don't have a way to test this, but there is something I struggle to understand

The code in kind adds a dev mapper for all the containers started by kind; the code in CAPD does the same for all the containers started by CAPD.

The two code paths do not overlap, and they must be kept ~in sync because we use the same base images (which is the only thing shared between kind and CAPD at this point).

Given that, if the mount is required for the containers started by kind, we should not drop adding the same mount for the containers started by CAPD... am I missing something?

[fabriziopandini]

Also, please add Fixes #8317 to the PR body

[cannonpalms]

Hmm, I see what you mean. I may have fixed the duplicate mount point issue, but re-broke the original problem. I wrote this on an airplane, so let me take a deeper look tomorrow. I appreciate the feedback.

[killianmuldoon]

/ok-to-test

I should be able to try to test this on my setup - will report back if I figure out what the interaction is here.

[killianmuldoon]

The issue here isn't that this overlaps with Kind - the update in #8157 added a second code path which mounts /dev/mapper. If we remove one it should work.

[killianmuldoon]

@cannonpalms do you think you'll have time to come back to this?

[cannonpalms]

Picking this back up. Apologies for radio silence! It took me this long just to clear my GitHub notifications /s.

[guettli]

@cannonpalms I don't have a btrfs system, so can't test. But we are doing a workshop, and I have concerns that some partitipants have btrfs. Could you check the above PR and tell us if it works for you?

[cannonpalms]

@cannonpalms I don't have a btrfs system, so can't test. But we are doing a workshop, and I have concerns that some partitipants have btrfs. Could you check the above PR and tell us if it works for you?

Travelling right now, but I can tell you that it worked for me at the time of last comment, and the workaround is to edit your docker config and change the storage driver to something like overlay2.

[guettli]

@killianmuldoon do you think we can merge this, now that the author said it is working for him?

[killianmuldoon]

I think I'd prefer to verify independently - I should be able to do so in the next couple of days though.

[killianmuldoon]

I'm testing with btrfs. I tried running this locally and it got past the issue on the load balancer but failed to bring up any Kubernetes nodes.

AFAIU we need to roll back most of the changes in this PR. The issue is that we try to mount the dev/mapper twice. We should remove the slightly less complete version of that in lines 415-419. I believe that change is sufficient to fix this issue completely.

[k8s-infra-cherrypick-robot]

@sbueringer: once the present PR merges, I will cherry-pick it on top of release-1.6 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.6

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.

[sbueringer]

/cherry-pick release-1.5

[k8s-infra-cherrypick-robot]

@sbueringer: once the present PR merges, I will cherry-pick it on top of release-1.5 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.5

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.

[sbueringer]

@cannonpalms Can you please rebase?

[cannonpalms]

@sbueringer Done.

[chrischdi]

/lgtm

pending ci

[k8s-ci-robot]

LGTM label has been added.

Git tree hash: 1fae200936ab7755b7a25d911498232b0abdc3b0

[sbueringer]

Thx!

/lgtm
/approve
/hold cancel

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sbueringer

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:

• OWNERS [sbueringer]

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

[k8s-infra-cherrypick-robot]

@sbueringer: #8376 failed to apply on top of branch "release-1.6":

Applying: fix(capd): remove hack for btrfs/zfs support
Using index info to reconstruct a base tree...
M	test/infrastructure/container/docker.go
Falling back to patching base and 3-way merge...
Auto-merging test/infrastructure/container/docker.go
CONFLICT (content): Merge conflict in test/infrastructure/container/docker.go
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(capd): remove hack for btrfs/zfs support
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:

/cherry-pick release-1.6

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]

@sbueringer: #8376 failed to apply on top of branch "release-1.5":

Applying: fix(capd): remove hack for btrfs/zfs support
Using index info to reconstruct a base tree...
M	test/infrastructure/container/docker.go
Falling back to patching base and 3-way merge...
Auto-merging test/infrastructure/container/docker.go
CONFLICT (content): Merge conflict in test/infrastructure/container/docker.go
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(capd): remove hack for btrfs/zfs support
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:

/cherry-pick release-1.5

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.

[typeid]

/area provider/infrastructure-docker