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

[18.06] disable containerd CRI plugin #29

Merged
merged 1 commit into from
Aug 7, 2018

Conversation

thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Jul 31, 2018

Implementation of moby#37519 fr 18.06, but without configuration option.

fixes moby#37507 for 18.06

Docker 18.06 does not have a configuration option to disable the CRI plugin, and this plugin is not very useful if containerd is not running standalone.

This patch disables the plugin if containerd is running as child-process of dockerd.

- How to verify it

  • build dockerd with this patch
  • start the daemon (dockerd &)
  • verify that the plugin is disabled in containerd's generated configuration file;
cat /var/run/docker/containerd/containerd.toml | grep disabled_plugins
disabled_plugins = ["cri"]

- Description for the changelog

* Disable the containerd CRI plugin if containerd is running as child-process of dockerd

Docker 18.06 does not have a configuration option to
disable the CRI plugin, and this plugin is not very
useful if containerd is not running standalone.

This patch disables the plugin if containerd is running
as child-process of dockerd.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah added this to the 18.06.1 milestone Jul 31, 2018
@thaJeztah
Copy link
Member Author

ping @cpuguy83 @dmcgowan PTAL

Copy link

@tiborvass tiborvass left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link

@andrewhsu andrewhsu left a comment

Choose a reason for hiding this comment

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

LGTM wrt not having a CRI plugin listening on a port

@mimmus
Copy link

mimmus commented Nov 8, 2018

Still present on latest CoreOS with 18.06.1-ce:
tcp 0 0 10.57.0.231:10010 0.0.0.0:* LISTEN 861/containerd

Any idea?

@thaJeztah
Copy link
Member Author

^^ answered here; containerd/containerd#2483 (comment)

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
4 participants