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
f21a707e
Unverified
Commit
f21a707e
authored
3 years ago
by
cola-zero
Committed by
GitHub
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Add containerd on Flatcar Container Linux (#7681)
parent
0ef7af76
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/container-engine/containerd/tasks/main.yml
+3
-4
3 additions, 4 deletions
roles/container-engine/containerd/tasks/main.yml
roles/kubernetes/node/tasks/install.yml
+1
-1
1 addition, 1 deletion
roles/kubernetes/node/tasks/install.yml
with
4 additions
and
5 deletions
roles/container-engine/containerd/tasks/main.yml
+
3
−
4
View file @
f21a707e
...
...
@@ -11,12 +11,11 @@
set_fact
:
is_ostree
:
"
{{
ostree.stat.exists
}}"
-
name
:
Fail containerd setup if distribution is not supported
fail
:
msg
:
"
{{
ansible_distribution
}}
is
not
supported
by
containerd."
when
:
-
not ansible_distribution in ["CentOS", "OracleLinux", "RedHat", "Ubuntu", "Debian", "Fedora", "AlmaLinux", "Amazon"]
-
not ansible_distribution in ["CentOS", "OracleLinux", "RedHat", "Ubuntu", "Debian", "Fedora", "AlmaLinux", "Amazon"
, "Flatcar Container Linux by Kinvolk"
]
-
name
:
gather os specific variables
include_vars
:
"
{{
item
}}"
...
...
@@ -54,7 +53,7 @@
-
not is_ostree
-
include_tasks
:
containerd_repo.yml
when
:
not is_ostree
when
:
not
(
is_ostree
or (ansible_distribution == "Flatcar Container Linux by Kinvolk"))
-
name
:
Create containerd service systemd directory if it doesn't exist
file
:
...
...
@@ -117,7 +116,7 @@
delay
:
"
{{
retry_stagger
|
d(3)
}}"
notify
:
restart containerd
when
:
-
not is_ostree
-
not
(
is_ostree
or (ansible_distribution == "Flatcar Container Linux by Kinvolk"))
-
containerd_package_info.pkgs|length >
0
-
include_role
:
# noqa unnamed-task
...
...
This diff is collapsed.
Click to expand it.
roles/kubernetes/node/tasks/install.yml
+
1
−
1
View file @
f21a707e
...
...
@@ -30,7 +30,7 @@
-
container_manager == "docker"
-
name
:
install | Copy socat wrapper for Container Linux with Containerd
command
:
"
{{
containerd_bin_dir
}}/ctr
run
--rm
--mount
type=bind,src={{
bin_dir
}},dst=/opt/bin,options=rbind:rw
{{
install_socat_image_repo
}}:{{
install_socat_image_tag
}}"
command
:
"
{{
containerd_bin_dir
}}/ctr
--namespace
k8s.io
run
--rm
--mount
type=bind,src={{
bin_dir
}},dst=/opt/bin,options=rbind:rw
{{
install_socat_image_repo
}}:{{
install_socat_image_tag
}}
copysocat
"
args
:
creates
:
"
{{
bin_dir
}}/socat"
when
:
...
...
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