From 6f82cf12f5fa3ef455fc8a5f88e951b698ea9efc Mon Sep 17 00:00:00 2001 From: rptaylor <1686627+rptaylor@users.noreply.github.com> Date: Mon, 27 Jun 2022 10:56:59 -0700 Subject: [PATCH] let containerd_default_runtime be undefined by default (#9026) --- docs/vars.md | 2 +- roles/container-engine/containerd/defaults/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/vars.md b/docs/vars.md index a63e560b0..56f8ff836 100644 --- a/docs/vars.md +++ b/docs/vars.md @@ -176,7 +176,7 @@ Stack](https://github.com/kubernetes-sigs/kubespray/blob/master/docs/dns-stack.m * *docker_options* - Commonly used to set ``--insecure-registry=myregistry.mydomain:5000`` * *docker_plugins* - This list can be used to define [Docker plugins](https://docs.docker.com/engine/extend/) to install. -* *containerd_default_runtime* - Sets the default Containerd runtime used by the Kubernetes CRI plugin. +* *containerd_default_runtime* - If defined, changes the default Containerd runtime used by the Kubernetes CRI plugin. * *containerd_additional_runtimes* - Sets the additional Containerd runtimes used by the Kubernetes CRI plugin. [Default config](https://github.com/kubernetes-sigs/kubespray/blob/master/roles/container-engine/containerd/defaults/main.yml) can be overriden in inventory vars. * *http_proxy/https_proxy/no_proxy/no_proxy_exclude_workers/additional_no_proxy* - Proxy variables for deploying behind a diff --git a/roles/container-engine/containerd/defaults/main.yml b/roles/container-engine/containerd/defaults/main.yml index 7ab50b347..76f39581a 100644 --- a/roles/container-engine/containerd/defaults/main.yml +++ b/roles/container-engine/containerd/defaults/main.yml @@ -4,7 +4,7 @@ containerd_state_dir: "/run/containerd" containerd_systemd_dir: "/etc/systemd/system/containerd.service.d" containerd_oom_score: 0 -containerd_default_runtime: "runc" +# containerd_default_runtime: "runc" # containerd_snapshotter: "native" containerd_runc_runtime: -- GitLab