Mercurial > code > home > repos > infra
changeset 113:c520672d0930
closer to multi-node k3s working, but still doesn't quite network right
| author | drewp@bigasterisk.com |
|---|---|
| date | Sat, 20 Aug 2022 22:35:31 -0700 |
| parents | 301869fa0ed6 |
| children | 7e280bf26dba |
| files | multikube.py multikube_config.py multikube_wipe.py tasks.py templates/kube/config-server.yaml.j2 |
| diffstat | 5 files changed, 13 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/multikube.py Sat Aug 20 22:34:59 2022 -0700 +++ b/multikube.py Sat Aug 20 22:35:31 2022 -0700 @@ -107,7 +107,6 @@ files.directory(path='/home/drewp/.kube', user='drewp', group='drewp') # .zshrc has: export KUBECONFIG=/etc/rancher/k3s/k3s.yaml - # assumes our pyinfra process is running on server_node if host.name != server_node: files.put(src='/tmp/k3s-yaml', dest='/etc/rancher/k3s/k3s.yaml')
--- a/multikube_config.py Sat Aug 20 22:34:59 2022 -0700 +++ b/multikube_config.py Sat Aug 20 22:35:31 2022 -0700 @@ -1,8 +1,13 @@ server_node = 'slash' -master_ip = "10.2.0.84" -nodes = ['dash'] -admin_from = ['slash', 'dash'] +server_ip = "10.2.0.84" +nodes = [ + 'dash', +] +admin_from = [ + 'slash', + 'dash', +] k3s_version = 'v1.24.3+k3s1'
--- a/multikube_wipe.py Sat Aug 20 22:34:59 2022 -0700 +++ b/multikube_wipe.py Sat Aug 20 22:35:31 2022 -0700 @@ -1,12 +1,9 @@ from pyinfra import host -from pyinfra.operations import files, server, systemd +from pyinfra.operations import server, files -from multikube_config import server_node, nodes +from multikube_config import nodes, server_node -def k3s_wipe(): +if host.name in nodes + [server_node]: files.put(dest='/usr/local/bin/k3s-killall.sh', src='files/kube/k3s-killall.sh', mode='a+rx') files.put(dest='/usr/local/bin/k3s-uninstall.sh', src='files/kube/k3s-uninstall.sh', mode='a+rx') server.shell(['k3s-uninstall.sh']) - -if host.name in nodes + [server_node]: - k3s_wipe()
--- a/tasks.py Sat Aug 20 22:34:59 2022 -0700 +++ b/tasks.py Sat Aug 20 22:35:31 2022 -0700 @@ -87,7 +87,8 @@ from multikube_config import server_node, nodes ctx.run(cmd + 'inventory.py multikube_wipe.py', pty=True) ctx.run(cmd + f'inventory.py multikube.py --limit {server_node}', pty=True) - ctx.run(cmd + f'inventory.py multikube.py --limit {",".join(nodes)}', pty=True) + if nodes: + ctx.run(cmd + f'inventory.py multikube.py --limit {",".join(nodes)}', pty=True) @task