--- a/multikube.py	Sun Apr 21 14:03:04 2024 -0700
+++ b/multikube.py	Sun Apr 21 17:01:13 2024 -0700
@@ -1,14 +1,17 @@
 # leave kube.py running single-host and try again
-import os
-
 from pyinfra import host
-from pyinfra.facts.files import FindInFile
-from pyinfra.facts.server import Arch, LinuxDistribution
+from pyinfra.facts.server import Arch
 from pyinfra.operations import files, server, systemd
 
-is_pi = host.get_fact(LinuxDistribution)['name'] in ['Debian', 'Raspbian GNU/Linux']
+from multikube_config import (
+    admin_from,
+    k3s_version,
+    nodes,
+    server_ip,
+    server_node,
+    skaffold_version,
+)
 
-from multikube_config import server_node, server_ip, nodes, admin_from, k3s_version, skaffold_version
 
 def install_k3s():
     tail = 'k3s' if host.get_fact(Arch) == 'x86_64' else 'k3s-armhf'
@@ -22,17 +25,17 @@
         #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'
-    ) 
+    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',
                    dest='/usr/local/bin/skaffold',
@@ -55,7 +58,7 @@
 def host_prep():
     server.sysctl(key='net.ipv4.ip_forward', value="1", persist=True)
     server.sysctl(key='net.ipv6.conf.all.forwarding', value="1", persist=True)
-    server.sysctl(key='net.ipv6.conf.all.disable_ipv6' , value='1',persist=True)
+    server.sysctl(key='net.ipv6.conf.all.disable_ipv6', value='1', persist=True)
     server.sysctl(key='fs.inotify.max_user_instances', value='8192', persist=True)
     server.sysctl(key='fs.inotify.max_user_watches', value='524288', persist=True)
 
@@ -82,7 +85,7 @@
         dest='/etc/k3s_config.yaml',
         server_ip=server_ip,
         token=token,
-        wg_ip=host.host_data['mk_addr'],#wireguard_address'],
+        wg_ip=host.host_data['mk_addr'],  #wireguard_address'],
     )
 
     files.template(
@@ -93,8 +96,8 @@
     systemd.service(service=service_name(), daemon_reload=True, enabled=True, restarted=True)
 
     if host.name == server_node:
-       files.get(src='/var/lib/rancher/k3s/server/node-token', dest='/tmp/k3s-token')
-       files.get(src='/etc/rancher/k3s/k3s.yaml', dest='/tmp/k3s-yaml')
+        files.get(src='/var/lib/rancher/k3s/server/node-token', dest='/tmp/k3s-token')
+        files.get(src='/etc/rancher/k3s/k3s.yaml', dest='/tmp/k3s-yaml')
 
 
 if host.name in nodes + [server_node]:
@@ -120,4 +123,5 @@
         files.put(src='/tmp/k3s-yaml', dest='/etc/rancher/k3s/k3s.yaml')
 
     files.file(path='/etc/rancher/k3s/k3s.yaml', user='root', group='drewp', mode='640')
-    server.shell(f"kubectl config set-cluster default --server=https://{server_ip}:6443 --kubeconfig=/etc/rancher/k3s/k3s.yaml")
+    server.shell(
+        commands=f"kubectl config set-cluster default --server=https://{server_ip}:6443 --kubeconfig=/etc/rancher/k3s/k3s.yaml")