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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mirror
Kubespray
Commits
e570e2e7
Unverified
Commit
e570e2e7
authored
5 years ago
by
Florian Ruynat
Committed by
GitHub
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Remove last rkt references (#5606)
parent
16fd2e5d
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/kubernetes/node/tasks/facts.yml
+2
-2
2 additions, 2 deletions
roles/kubernetes/node/tasks/facts.yml
roles/kubernetes/node/tasks/pre_upgrade.yml
+3
-3
3 additions, 3 deletions
roles/kubernetes/node/tasks/pre_upgrade.yml
with
5 additions
and
5 deletions
roles/kubernetes/node/tasks/facts.yml
+
2
−
2
View file @
e570e2e7
...
...
@@ -3,7 +3,7 @@
shell
:
"
docker
info
|
grep
'Cgroup
Driver'
|
awk
-F':
'
'{
print
$2;
}'"
register
:
docker_cgroup_driver_result
changed_when
:
false
when
:
container_manager in ['crio', 'docker'
, 'rkt'
]
when
:
container_manager in ['crio', 'docker']
-
name
:
set standalone_kubelet fact
set_fact
:
...
...
@@ -19,7 +19,7 @@
-
name
:
set kubelet_cgroup_driver_detected fact for other engines
set_fact
:
kubelet_cgroup_driver_detected
:
"
{{
docker_cgroup_driver_result.stdout
}}"
when
:
container_manager in ['crio', 'docker'
, 'rkt'
]
when
:
container_manager in ['crio', 'docker']
-
name
:
os specific vars
include_vars
:
"
{{
item
}}"
...
...
This diff is collapsed.
Click to expand it.
roles/kubernetes/node/tasks/pre_upgrade.yml
+
3
−
3
View file @
e570e2e7
---
-
name
:
"
Pre-upgrade
|
check
if
kubelet
container
exists"
shell
:
>-
{% if container_manager in ['crio', 'docker'
, 'rkt'
] %}
{% if container_manager in ['crio', 'docker'] %}
docker ps -af name=kubelet | grep kubelet
{% elif container_manager == 'containerd' %}
crictl ps --all --name kubelet | grep kubelet
...
...
@@ -12,7 +12,7 @@
-
name
:
"
Pre-upgrade
|
copy
/var/lib/cni
from
kubelet"
command
:
>-
{% if container_manager in ['crio', 'docker'
, 'rkt'
] %}
{% if container_manager in ['crio', 'docker'] %}
docker cp kubelet:/var/lib/cni /var/lib/cni
{% elif container_manager == 'containerd' %}
ctr run --rm --mount type=bind,src=/var/lib/cni,dst=/cnilibdir,options=rbind:rw kubelet kubelet-tmp sh -c 'cp /var/lib/cni/* /cnilibdir/'
...
...
@@ -30,7 +30,7 @@
-
name
:
"
Pre-upgrade
|
ensure
kubelet
container
is
removed
if
using
host
deployment"
shell
:
>-
{% if container_manager in ['crio', 'docker'
, 'rkt'
] %}
{% if container_manager in ['crio', 'docker'] %}
docker rm -fv kubelet
{% elif container_manager == 'containerd' %}
crictl stop kubelet && crictl rm kubelet
...
...
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