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
36a3a789
Unverified
Commit
36a3a789
authored
4 years ago
by
Etienne Champetier
Committed by
GitHub
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix remove-node by removing jq usage (#7405)
Signed-off-by:
Etienne Champetier
<
e.champetier@ateme.com
>
parent
2d1597bf
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
roles/remove-node/pre-remove/tasks/main.yml
+5
-15
5 additions, 15 deletions
roles/remove-node/pre-remove/tasks/main.yml
with
5 additions
and
15 deletions
roles/remove-node/pre-remove/tasks/main.yml
+
5
−
15
View file @
36a3a789
...
@@ -3,25 +3,13 @@
...
@@ -3,25 +3,13 @@
set_fact
:
set_fact
:
nodes_to_drain
:
[]
nodes_to_drain
:
[]
-
name
:
remove-node | Identify nodes to drain, ignore non-cluster nodes
-
name
:
remove-node | List nodes
shell
:
|
command
:
kubectl get nodes -o go-template={% raw %}'{{ range .items }}{{ .metadata.name }}{{ "\n" }}{{ end }}'{% endraw %}
set -o pipefail
{{ bin_dir }}/kubectl get nodes -o json \
| jq .items[].metadata.name \
| jq "select(. | test(\"^{{ hostvars[item]['kube_override_hostname']|default(item) }}$\"))"
loop
:
"
{{
node.split(',')
|
default(groups['kube-node'])
}}"
register
:
nodes
register
:
nodes
delegate_to
:
"
{{
groups['kube_control_plane']|first
}}"
delegate_to
:
"
{{
groups['kube_control_plane']|first
}}"
changed_when
:
false
changed_when
:
false
run_once
:
true
run_once
:
true
-
name
:
remove-node | Generate list of nodes to drain
set_fact
:
nodes_to_drain
:
"
{{
nodes_to_drain
}}
+
[
'{{
item.stdout
|
regex_replace('
\"
',
'')
}}'
]"
loop
:
"
{{
nodes.results
}}"
when
:
item.stdout | length !=
0
run_once
:
true
-
name
:
remove-node | Drain node except daemonsets resource
# noqa 301
-
name
:
remove-node | Drain node except daemonsets resource
# noqa 301
command
:
>-
command
:
>-
{{ bin_dir }}/kubectl --kubeconfig /etc/kubernetes/admin.conf drain
{{ bin_dir }}/kubectl --kubeconfig /etc/kubernetes/admin.conf drain
...
@@ -30,7 +18,9 @@
...
@@ -30,7 +18,9 @@
--grace-period {{ drain_grace_period }}
--grace-period {{ drain_grace_period }}
--timeout {{ drain_timeout }}
--timeout {{ drain_timeout }}
--delete-local-data {{ hostvars[item]['kube_override_hostname']|default(item) }}
--delete-local-data {{ hostvars[item]['kube_override_hostname']|default(item) }}
loop
:
"
{{
nodes_to_drain
}}"
loop
:
"
{{
node.split(',')
|
default(groups['kube-node'])
}}"
# ignore servers that are not nodes
when
:
hostvars[item]['kube_override_hostname']|default(item) in nodes.stdout_lines
register
:
result
register
:
result
failed_when
:
result.rc != 0 and not allow_ungraceful_removal
failed_when
:
result.rc != 0 and not allow_ungraceful_removal
delegate_to
:
"
{{
groups['kube_control_plane']|first
}}"
delegate_to
:
"
{{
groups['kube_control_plane']|first
}}"
...
...
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