# HG changeset patch
# User drewp@bigasterisk.com
# Date 1661060131 25200
# Node ID c520672d09305084244f01b6f54cd56cc6d45a20
# Parent  301869fa0ed65cf69a341fdab5fa8ab1ce34e03b
closer to multi-node k3s working, but still doesn't quite network right

diff -r 301869fa0ed6 -r c520672d0930 multikube.py
--- 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')
 
diff -r 301869fa0ed6 -r c520672d0930 multikube_config.py
--- 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'
 
diff -r 301869fa0ed6 -r c520672d0930 multikube_wipe.py
--- 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()
diff -r 301869fa0ed6 -r c520672d0930 tasks.py
--- 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
diff -r 301869fa0ed6 -r c520672d0930 templates/kube/config-server.yaml.j2
--- a/templates/kube/config-server.yaml.j2	Sat Aug 20 22:34:59 2022 -0700
+++ b/templates/kube/config-server.yaml.j2	Sat Aug 20 22:35:31 2022 -0700
@@ -2,4 +2,3 @@
 node-ip: {{ wg_ip }}
 disable:
   - traefik
-flannel-backend: host-gw