Upstream/ansible-role-k3s
1
0
Fork 0
mirror of https://github.com/PyratLabs/ansible-role-k3s.git synced 2024-11-26 12:27:28 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'bugfix-k3s_node_data_dir' into role_v2

Browse Source
This commit is contained in:
Xan Manning 2020-10-19 20:35:32 +01:00
commit f3173f193f
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tasks/build/configure-k3s-cluster.yml
View File

@ -2,7 +2,7 @@
- name: Ensure NODE_TOKEN is captured from control node - name: Ensure NODE_TOKEN is captured from control node
slurp: slurp:
path: "/var/lib/rancher/k3s/server/node-token" path: "{{ k3s_node_data_dir | default ('/var/lib/rancher/k3s') }}/server/node-token"
register: k3s_slurped_control_token register: k3s_slurped_control_token
delegate_to: "{{ k3s_control_delegate }}" delegate_to: "{{ k3s_control_delegate }}"
when: k3s_control_token is not defined and not ansible_check_mode when: k3s_control_token is not defined and not ansible_check_mode

4
templates/k3s-killall.sh.j2
View File

@ -2,7 +2,7 @@
[ $(id -u) -eq 0 ] || exec sudo $0 $@ [ $(id -u) -eq 0 ] || exec sudo $0 $@
for bin in /var/lib/rancher/k3s/data/**/bin/; do for bin in {{ k3s_node_data_dir | default('/var/lib/rancher/k3s') }}/data/**/bin/; do
[ -d "$bin" ] && export PATH=$bin:$PATH [ -d "$bin" ] && export PATH=$bin:$PATH
done done
@ -62,7 +62,7 @@ do_unmount() {
} }
do_unmount '/run/k3s' do_unmount '/run/k3s'
do_unmount '/var/lib/rancher/k3s' do_unmount '{{ k3s_node_data_dir | default('/var/lib/rancher/k3s') }}'
do_unmount '/var/lib/kubelet/pods' do_unmount '/var/lib/kubelet/pods'
do_unmount '/run/netns/cni-' do_unmount '/run/netns/cni-'

2
templates/k3s-uninstall.sh.j2
View File

@ -55,7 +55,7 @@ for bin in {{ k3s_install_dir }}/k3s*; do
done done
[ -d /etc/rancher/k3s ] && rm -rf /etc/rancher/k3s [ -d /etc/rancher/k3s ] && rm -rf /etc/rancher/k3s
[ -d /var/lib/rancher/k3s ] && rm -rf /var/lib/rancher/k3s [ -d {{ k3s_node_data_dir | default('/var/lib/rancher/k3s') }} ] && rm -rf {{ k3s_node_data_dir | default('/var/lib/rancher/k3s') }}
[ -d /var/lib/kubelet ] && rm -rf /var/lib/kubelet [ -d /var/lib/kubelet ] && rm -rf /var/lib/kubelet
[ -f /usr/local/bin/k3s-killall.sh ] && rm -f /usr/local/bin/k3s-killall.sh [ -f /usr/local/bin/k3s-killall.sh ] && rm -f /usr/local/bin/k3s-killall.sh