diff --git a/roles/kubespray-defaults/defaults/main.yaml b/roles/kubespray-defaults/defaults/main.yaml index 378f49ab10b5928ea245d999ea12ce2ac8f0cc19..12868289587dceea923479ada5ac5c7229b9bd06 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 fc4736447d866cf6edc914185d229f15f208fb2f..366921a9a06c9b57f1c4b419a4573871bc3a649a 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