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
b2f3ab77
Commit
b2f3ab77
authored
4 years ago
by
Etienne Champetier
Committed by
Kubernetes Prow Robot
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
docker: remove some old debug code
Signed-off-by:
Etienne Champetier
<
champetier.etienne@gmail.com
>
parent
b2f6ed7d
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
roles/container-engine/containerd/tasks/main.yml
+0
-1
0 additions, 1 deletion
roles/container-engine/containerd/tasks/main.yml
roles/container-engine/docker/tasks/main.yml
+0
-17
0 additions, 17 deletions
roles/container-engine/docker/tasks/main.yml
with
0 additions
and
18 deletions
roles/container-engine/containerd/tasks/main.yml
+
0
−
1
View file @
b2f3ab77
...
...
@@ -107,7 +107,6 @@
when
:
-
not is_ostree
-
containerd_package_info.pkgs|length >
0
ignore_errors
:
true
-
include_role
:
name
:
container-engine/crictl
This diff is collapsed.
Click to expand it.
roles/container-engine/docker/tasks/main.yml
+
0
−
17
View file @
b2f3ab77
...
...
@@ -159,7 +159,6 @@
with_items
:
"
{{
docker_package_info.pkgs
}}"
notify
:
restart docker
when
:
not (ansible_os_family in ["Flatcar Container Linux by Kinvolk", "ClearLinux"] or is_ostree) and (docker_package_info.pkgs|length > 0)
ignore_errors
:
true
-
name
:
Ensure docker packages are installed
action
:
"
{{
docker_package_info.pkg_mgr
}}"
...
...
@@ -172,24 +171,8 @@
retries
:
4
delay
:
"
{{
retry_stagger
|
d(3)
}}"
notify
:
restart docker
ignore_errors
:
true
when
:
ansible_os_family in ["ClearLinux"]
-
name
:
get available packages on Ubuntu
command
:
apt-cache policy docker-ce
when
:
-
docker_task_result is failed
-
ansible_distribution == 'Ubuntu'
register
:
available_packages
check_mode
:
false
-
name
:
show available packages on ubuntu
fail
:
msg
:
"
{{
available_packages
}}"
when
:
-
docker_task_result is failed
-
ansible_distribution == 'Ubuntu'
# This is required to ensure any apt upgrade will not break kubernetes
-
name
:
Tell Debian hosts not to change the docker version with apt upgrade
dpkg_selections
:
...
...
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