Skip to content
This repository has been archived by the owner on May 30, 2023. It is now read-only.

app-emulation/containerd: Switch to default socket location #771

Merged
merged 2 commits into from Jan 11, 2021

Conversation

pothos
Copy link
Member

@pothos pothos commented Jan 11, 2021

The upstream socket is under /run/containerd/containerd.sock which many
tools like crictl will use by default and diverging causes users to
always have to configure a non-default location.
Switch to the upstream default while still keeping a symlink so that
users are not forced to update their configurations they had to do for
the non-default location. This also keeps Docker using the old socket
location as an assertion that the symlink works. The state directory
is also switch to the default location.

How to use

Build an image and run the tests

Testing done

Manually created a drop-in config with the new contents.

The upstream socket is under /run/containerd/containerd.sock which many
tools like crictl will use by default and diverging causes users to
always have to configure a non-default location.
Switch to the upstream default while still keeping a symlink so that
users are not forced to update their configurations they had to do for
the non-default location. This also keeps Docker using the old socket
location as an assertion that the symlink works. The state directory
is also switch to the default location.
Copy link
Contributor

@margamanterola margamanterola left a comment

Choose a reason for hiding this comment

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

LGTM

@pothos pothos merged commit 04bfe83 into main Jan 11, 2021
pothos added a commit that referenced this pull request Jan 11, 2021
app-emulation/containerd: Switch to default socket location
@pothos pothos deleted the kai/containerd-default-socket branch January 11, 2021 16:41
pothos added a commit that referenced this pull request Jan 25, 2021
app-emulation/containerd: Switch to default socket location
pothos added a commit that referenced this pull request Jan 25, 2021
app-emulation/containerd: Switch to default socket location
@pothos
Copy link
Member Author

pothos commented Jan 25, 2021

Picked for flatcar-2605 and flatcar-2705

pothos added a commit that referenced this pull request Feb 1, 2021
app-emulation/containerd: Switch to default socket location
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
2 participants