kubernetes-sigs
/
kubespray
mirror of https://github.com/kubernetes-sigs/kubespray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix reset containerd_storage_dir undefined (#8478) 

* fix reset containerd_storage_dir

* add env to kubespray-defaults
pull/8496/head
Samuel Liu 2022-01-31 21:46:23 +08:00 committed by GitHub
parent 7d4d554436
commit e6e7fbc25f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
roles/kubespray-defaults/defaults/main.yaml
View File

@ -359,6 +359,12 @@ containerd_use_systemd_cgroup: true
# - 172.19.16.11:5000 # - 172.19.16.11:5000
containerd_insecure_registries: [] 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) # Settings for containerized control plane (etcd/kubelet/secrets)
# deployment type for legacy etcd mode # deployment type for legacy etcd mode
etcd_deployment_type: host etcd_deployment_type: host
@ -651,3 +657,6 @@ proxy_disable_env:
http_proxy: '' http_proxy: ''
https_proxy: '' https_proxy: ''
no_proxy: '' no_proxy: ''
# krew root dir
krew_root_dir: "/usr/local/krew"

2
roles/reset/tasks/main.yml
View File

@ -324,7 +324,7 @@
- /etc/bash_completion.d/nerdctl - /etc/bash_completion.d/nerdctl
- /etc/bash_completion.d/krew - /etc/bash_completion.d/krew
- /etc/bash_completion.d/krew.sh - /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/kube_proxy-ipvs.conf
- /etc/modules-load.d/kubespray-br_netfilter.conf - /etc/modules-load.d/kubespray-br_netfilter.conf
- /etc/modules-load.d/kubespray-kata-containers.conf - /etc/modules-load.d/kubespray-kata-containers.conf