From 86265a174271f8cd4d482c433042910a60ca4f7e Mon Sep 17 00:00:00 2001 From: Mark Rossetti Date: Fri, 29 Apr 2022 09:48:02 -0700 Subject: [PATCH 1/2] Updating containerd install details Signed-off-by: Mark Rossetti --- .../production-environment/container-runtimes.md | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/content/en/docs/setup/production-environment/container-runtimes.md b/content/en/docs/setup/production-environment/container-runtimes.md index 8c5e744502..07b2b5a4a2 100644 --- a/content/en/docs/setup/production-environment/container-runtimes.md +++ b/content/en/docs/setup/production-environment/container-runtimes.md @@ -166,18 +166,14 @@ Use the following commands to install Containerd on your system: 1. Install containerd: Visit - [Getting started with containerd](https://containerd.io/docs/getting-started/#starting-containerd) + [Getting started with containerd](https://github.com/containerd/containerd/blob/main/docs/getting-started.md) and follow the instructions there, up to the point where you have a valid - configuration file (on Linux: `/etc/containerd/config.toml`). + configuration file, config.toml. + On Linux, you can find this file under the path `/etc/containerd/config.toml`. + On Windows, you ocan find this file under the path `c:\Program File\containerd\config.toml`. - If you are running Windows, you might want to exclude containerd from Windows Defender Scans - ```powershell - # If excluding containerd from Windows Defender scans, consider how else - # you will make sure that the executable is genuine. - Add-MpPreference -ExclusionProcess "$Env:ProgramFiles\containerd\containerd.exe" - ``` - -For containerd, the CRI socket is `/run/containerd/containerd.sock` by default. +On Linux the default CRI socket for containerd is `/run/containerd/containerd.sock`. +On Windows the default CRI endpoint is `npipe://./pipe/containerd-containerd`. #### Configuring the `systemd` cgroup driver {#containerd-systemd} From aaadcc1c9a291a573afb8ceb2b5f1dfd1a2a245f Mon Sep 17 00:00:00 2001 From: Mark Rossetti Date: Fri, 29 Apr 2022 10:33:57 -0700 Subject: [PATCH 2/2] Update content/en/docs/setup/production-environment/container-runtimes.md Co-authored-by: divya-mohan0209 --- .../en/docs/setup/production-environment/container-runtimes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/en/docs/setup/production-environment/container-runtimes.md b/content/en/docs/setup/production-environment/container-runtimes.md index 07b2b5a4a2..1f658fa262 100644 --- a/content/en/docs/setup/production-environment/container-runtimes.md +++ b/content/en/docs/setup/production-environment/container-runtimes.md @@ -170,7 +170,7 @@ Use the following commands to install Containerd on your system: and follow the instructions there, up to the point where you have a valid configuration file, config.toml. On Linux, you can find this file under the path `/etc/containerd/config.toml`. - On Windows, you ocan find this file under the path `c:\Program File\containerd\config.toml`. + On Windows, you can find this file under the path `C:\Program Files\containerd\config.toml`. On Linux the default CRI socket for containerd is `/run/containerd/containerd.sock`. On Windows the default CRI endpoint is `npipe://./pipe/containerd-containerd`.