From e6e7fbc25f2348b4bb5dd26f080230c4a2e722f5 Mon Sep 17 00:00:00 2001 From: Samuel Liu Date: Mon, 31 Jan 2022 21:46:23 +0800 Subject: [PATCH] fix reset containerd_storage_dir undefined (#8478) * fix reset containerd_storage_dir * add env to kubespray-defaults --- roles/kubespray-defaults/defaults/main.yaml | 9 +++++++++ roles/reset/tasks/main.yml | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/roles/kubespray-defaults/defaults/main.yaml b/roles/kubespray-defaults/defaults/main.yaml index 378f49ab1..128682895 100644 --- a/roles/kubespray-defaults/defaults/main.yaml +++ b/roles/kubespray-defaults/defaults/main.yaml @@ -359,6 +359,12 @@ containerd_use_systemd_cgroup: true # - 172.19.16.11:5000 containerd_insecure_registries: [] +# Containerd conf default dir +containerd_storage_dir: "/var/lib/containerd" +containerd_state_dir: "/run/containerd" +containerd_systemd_dir: "/etc/systemd/system/containerd.service.d" +containerd_cfg_dir: "/etc/containerd" + # Settings for containerized control plane (etcd/kubelet/secrets) # deployment type for legacy etcd mode etcd_deployment_type: host @@ -651,3 +657,6 @@ proxy_disable_env: http_proxy: '' https_proxy: '' no_proxy: '' + +# krew root dir +krew_root_dir: "/usr/local/krew" diff --git a/roles/reset/tasks/main.yml b/roles/reset/tasks/main.yml index fc4736447..366921a9a 100644 --- a/roles/reset/tasks/main.yml +++ b/roles/reset/tasks/main.yml @@ -324,7 +324,7 @@ - /etc/bash_completion.d/nerdctl - /etc/bash_completion.d/krew - /etc/bash_completion.d/krew.sh - - "{{ krew_root_dir | default('/usr/local/krew') }}" + - "{{ krew_root_dir }}" - /etc/modules-load.d/kube_proxy-ipvs.conf - /etc/modules-load.d/kubespray-br_netfilter.conf - /etc/modules-load.d/kubespray-kata-containers.conf