Fix: Use containerd binary from path in Flatcar

[4ch3los]

What this PR does / why we need it:
With the latest stable release of flatcar(https://www.flatcar.org/releases#release-3815.2.0), they removed the old containerd installation with torcx and moved to the upstream gentoo builds. This results in a broken containerd.service, because the kubeone dropin refers to the torcx path. Both old(LTS) and new versions PATH var contains the binary, so we are safe to just use the binary from PATH.

Which issue(s) this PR fixes:
NONE

What type of PR is this?

/kind bug

Special notes for your reviewer:

Does this PR introduce a user-facing change? Then add your Release Note here:

fixed support for flatcar stable channel 3815.2.0

Documentation:

NONE

[kubermatic-bot]

Hi @4ch3los. Thanks for your PR.

I'm waiting for a kubermatic 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.

[kron4eg]

Thank you @4ch3los!

You will need to update fixtures too. Please run hack/update-fixtures.sh and commit the results.

@ahmedwaleedmalik I think we need same change for the OSM, don't we?

[kron4eg]

/test pull-kubeone-test

[kron4eg]

I wonder if we can make it compatible with the previous flatcar versions (some people run outdated images).

Since containerd already is in the ${TORCX_BINDIR}, and ${TORCX_BINDIR} is in the PATH, we can simply do this, that supposedly would make it forward and backward compatible.

diff --git pkg/scripts/render.go pkg/scripts/render.go
index c1d3f76c..3576bb9f 100644
--- pkg/scripts/render.go
+++ pkg/scripts/render.go
@@ -122,7 +122,7 @@ var containerRuntimeTemplates = map[string]string{
                        Restart=always
                        Environment=CONTAINERD_CONFIG=/etc/containerd/config.toml
                        ExecStart=
-                       ExecStart=/usr/bin/env PATH=\${TORCX_BINDIR}:\${PATH} \${TORCX_BINDIR}/containerd --config \${CONTAINERD_CONFIG}
+                       ExecStart=/usr/bin/env PATH=\${TORCX_BINDIR}:\${PATH} containerd --config \${CONTAINERD_CONFIG}
                        EOF
                `),
 }

[kron4eg]

small suggestion

[kron4eg]

/cherry-pick release/v1.7

[kubermatic-bot]

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

In response to this:

/cherry-pick release/v1.7

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.

[kron4eg]

/cherry-pick release/v1.6

[kubermatic-bot]

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

In response to this:

/cherry-pick release/v1.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.

[kron4eg]

/approve

[kubermatic-bot]

LGTM label has been added.

Git tree hash: 107fc7724136dca21299dc53cd4bbd3dce538c4f

[kubermatic-bot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kron4eg

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 [kron4eg]

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

[kubermatic-bot]

@kron4eg: #3040 failed to apply on top of branch "release/v1.7":

Applying: Use containerd binary from path, as flat removed torcx in their newest release and the binary path has changed
Using index info to reconstruct a base tree...
M	pkg/scripts/render.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/scripts/render.go
Applying: Updated fixtures
Using index info to reconstruct a base tree...
M	pkg/scripts/testdata/TestKubeadmFlatcar-force.golden
M	pkg/scripts/testdata/TestKubeadmFlatcar-overwrite_registry.golden
M	pkg/scripts/testdata/TestKubeadmFlatcar-with_cilium.golden
M	pkg/scripts/testdata/TestKubeadmFlatcar-with_containerd.golden
M	pkg/scripts/testdata/TestKubeadmFlatcar-with_containerd_with_insecure_registry.golden
Falling back to patching base and 3-way merge...
Auto-merging pkg/scripts/testdata/TestKubeadmFlatcar-with_containerd_with_insecure_registry.golden
Auto-merging pkg/scripts/testdata/TestKubeadmFlatcar-with_containerd.golden
Auto-merging pkg/scripts/testdata/TestKubeadmFlatcar-with_cilium.golden
CONFLICT (content): Merge conflict in pkg/scripts/testdata/TestKubeadmFlatcar-with_cilium.golden
Auto-merging pkg/scripts/testdata/TestKubeadmFlatcar-overwrite_registry.golden
CONFLICT (content): Merge conflict in pkg/scripts/testdata/TestKubeadmFlatcar-overwrite_registry.golden
Auto-merging pkg/scripts/testdata/TestKubeadmFlatcar-force.golden
CONFLICT (content): Merge conflict in pkg/scripts/testdata/TestKubeadmFlatcar-force.golden
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 Updated fixtures
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/v1.7

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.

[kubermatic-bot]

@kron4eg: #3040 failed to apply on top of branch "release/v1.6":

Applying: Use containerd binary from path, as flat removed torcx in their newest release and the binary path has changed
Using index info to reconstruct a base tree...
M	pkg/scripts/render.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/scripts/render.go
Applying: Updated fixtures
Using index info to reconstruct a base tree...
M	pkg/scripts/testdata/TestKubeadmFlatcar-force.golden
M	pkg/scripts/testdata/TestKubeadmFlatcar-overwrite_registry.golden
M	pkg/scripts/testdata/TestKubeadmFlatcar-with_cilium.golden
M	pkg/scripts/testdata/TestKubeadmFlatcar-with_containerd.golden
M	pkg/scripts/testdata/TestKubeadmFlatcar-with_containerd_with_insecure_registry.golden
M	pkg/scripts/testdata/TestMigrateToContainerd-flatcar.golden
M	pkg/scripts/testdata/TestUpgradeKubeadmAndCNIFlatcar.golden
M	pkg/scripts/testdata/TestUpgradeKubeletAndKubectlFlatcar.golden
Falling back to patching base and 3-way merge...
Auto-merging pkg/scripts/testdata/TestUpgradeKubeletAndKubectlFlatcar.golden
Auto-merging pkg/scripts/testdata/TestUpgradeKubeadmAndCNIFlatcar.golden
Auto-merging pkg/scripts/testdata/TestMigrateToContainerd-flatcar.golden
Auto-merging pkg/scripts/testdata/TestKubeadmFlatcar-with_containerd_with_insecure_registry.golden
Auto-merging pkg/scripts/testdata/TestKubeadmFlatcar-with_containerd.golden
Auto-merging pkg/scripts/testdata/TestKubeadmFlatcar-with_cilium.golden
CONFLICT (content): Merge conflict in pkg/scripts/testdata/TestKubeadmFlatcar-with_cilium.golden
Auto-merging pkg/scripts/testdata/TestKubeadmFlatcar-overwrite_registry.golden
CONFLICT (content): Merge conflict in pkg/scripts/testdata/TestKubeadmFlatcar-overwrite_registry.golden
Auto-merging pkg/scripts/testdata/TestKubeadmFlatcar-force.golden
CONFLICT (content): Merge conflict in pkg/scripts/testdata/TestKubeadmFlatcar-force.golden
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 Updated fixtures
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/v1.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.

[kron4eg]

Okey, I'll create manual cherrypicks