--- a/multikube.py	Wed Dec 21 17:42:28 2022 -0800
+++ b/multikube.py	Wed Dec 21 17:44:32 2022 -0800
@@ -10,7 +10,7 @@
 
 from multikube_config import server_node, server_ip, nodes, admin_from, k3s_version, skaffold_version
 
-def download_k3s():
+def install_k3s():
     tail = 'k3s' if host.get_fact(Arch) == 'x86_64' else 'k3s-armhf'
     files.download(
         src=f'https://github.com/rancher/k3s/releases/download/{k3s_version}/{tail}',
@@ -22,6 +22,16 @@
         #force=True,  # to get a new version
     )
 
+def install_k3sup():
+    files.download(
+        src='https://github.com/alexellis/k3sup/releases/download/0.12.0/k3sup',
+        dest='/usr/local/bin/k3sup',
+        mode='755'
+    ) 
+    # then do like:
+    #  root@slash:/home/drewp# ./k3sup install --ip 10.2.0.84 --k3s-extra-args '--no-deploy traefik' --ssh-key /root/.ssh/id_ecdsa
+    #  root@slash:/home/drewp# ./k3sup join --ip 10.2.0.23 --server-ip 10.2.0.84  --ssh-key /root/.ssh/id_ecdsa
+    # but it doesn't seem to make networking go any better
 
 def install_skaffold():
     files.download(src=f'https://storage.googleapis.com/skaffold/releases/{skaffold_version}/skaffold-linux-amd64',
@@ -60,7 +70,6 @@
     return 'k3s.service' if host.name == server_node else 'k3s-node.service'
 
 def config_and_run_service():
-    download_k3s()
     role = 'server' if host.name == server_node else 'agent'
     which_conf = 'config-server.yaml.j2' if host.name == server_node else 'config-agent.yaml.j2'
 
@@ -91,7 +100,7 @@
 if host.name in nodes + [server_node]:
     host_prep()
     files.directory(path='/etc/rancher/k3s')
-
+    install_k3s()
     config_and_run_service()
 
     # docs: https://rancher.com/docs/k3s/latest/en/installation/private-registry/

--- a/multikube_config.py	Wed Dec 21 17:42:28 2022 -0800
+++ b/multikube_config.py	Wed Dec 21 17:44:32 2022 -0800
@@ -2,11 +2,13 @@
 server_node = 'slash'
 server_ip = "10.2.0.84"
 nodes = [
+    'plus',
+    # 'garage',
     'dash',
 ]
 admin_from = [
     'slash',
-    'dash',
+    'plus',
 ]
 
 k3s_version = 'v1.24.3+k3s1'

--- a/multikube_wipe.py	Wed Dec 21 17:42:28 2022 -0800
+++ b/multikube_wipe.py	Wed Dec 21 17:44:32 2022 -0800
@@ -7,3 +7,5 @@
     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'])
+    for n in ['k3s-agent.service', 'k3s-agent.service.env', 'k3s-node.service']:
+        files.file(path=f'/etc/systemd/system/{n}', present=False)
\ No newline at end of file

--- a/tasks.py	Wed Dec 21 17:42:28 2022 -0800
+++ b/tasks.py	Wed Dec 21 17:44:32 2022 -0800
@@ -88,7 +88,12 @@
     ctx.run(cmd + 'inventory.py multikube_wipe.py', pty=True)
     ctx.run(cmd + f'inventory.py multikube.py --limit {server_node}', pty=True)
     if nodes:
-        ctx.run(cmd + f'inventory.py multikube.py --limit {",".join(nodes)}', pty=True)
+        ctx.run(cmd + f'inventory.py multikube.py {" ".join(f"--limit {n}" for n in nodes)}', pty=True)
+    print("""now try
+    curl http://10.43.0.10:9153/metrics | head
+    k3s kubectl run hello --image crccheck/hello-world
+    curl -m2 http://`kubectl get pod/hello '-o=jsonpath={.status.podIP}'`:8000
+    """)
 
 
 @task