Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
Kubespray
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mirror
Kubespray
Commits
e6e7fbc2
Unverified
Commit
e6e7fbc2
authored
3 years ago
by
Samuel Liu
Committed by
GitHub
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
fix reset containerd_storage_dir undefined (#8478)
* fix reset containerd_storage_dir * add env to kubespray-defaults
parent
7d4d5544
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
roles/kubespray-defaults/defaults/main.yaml
+9
-0
9 additions, 0 deletions
roles/kubespray-defaults/defaults/main.yaml
roles/reset/tasks/main.yml
+1
-1
1 addition, 1 deletion
roles/reset/tasks/main.yml
with
10 additions
and
1 deletion
roles/kubespray-defaults/defaults/main.yaml
+
9
−
0
View file @
e6e7fbc2
...
...
@@ -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"
This diff is collapsed.
Click to expand it.
roles/reset/tasks/main.yml
+
1
−
1
View file @
e6e7fbc2
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment