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
eb40ac16
Commit
eb40ac16
authored
5 years ago
by
Matthew Mosesohn
Committed by
Kubernetes Prow Robot
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Move cri_socket var to kubespray-defaults (#5149)
parent
27ec548b
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
roles/download/tasks/main.yml
+0
-15
0 additions, 15 deletions
roles/download/tasks/main.yml
roles/kubespray-defaults/defaults/main.yaml
+10
-0
10 additions, 0 deletions
roles/kubespray-defaults/defaults/main.yaml
with
10 additions
and
15 deletions
roles/download/tasks/main.yml
+
0
−
15
View file @
eb40ac16
...
...
@@ -7,21 +7,6 @@
-
download
-
upload
-
name
:
Use cri-o for cri connection
set_fact
:
cri_socket
:
/var/run/crio/crio.sock
when
:
container_manager == 'crio'
-
name
:
Use containerd for cri connection
set_fact
:
cri_socket
:
/var/run/containerd/containerd.sock
when
:
container_manager == 'containerd'
-
name
:
Use docker for cri connection
set_fact
:
cri_socket
:
/var/run/dockershim.sock
when
:
container_manager == 'docker'
-
include_tasks
:
../../container-engine/containerd/tasks/crictl.yml
when
:
-
not skip_downloads|default(false)
...
...
This diff is collapsed.
Click to expand it.
roles/kubespray-defaults/defaults/main.yaml
+
10
−
0
View file @
eb40ac16
...
...
@@ -198,6 +198,16 @@ kube_profiling: false
# Container for runtime
container_manager
:
docker
# CRI socket path
cri_socket
:
>-
{%- if container_manager == 'crio' -%}
/var/run/crio/crio.sock
{%- elif container_manager == 'containerd' -%}
/var/run/containerd/containerd.sock
{%- else -%}
/var/run/dockershim.sock
{%- endif -%}
## Uncomment this if you want to force overlay/overlay2 as docker storage driver
## Please note that overlay2 is only supported on newer kernels
# docker_storage_options: -s overlay2
...
...
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