From d53b382138347d6f185578ebec5a9b317eac20a5 Mon Sep 17 00:00:00 2001
From: Donal Byrne <byrnedo@tcd.ie>
Date: Thu, 8 Aug 2024 08:38:45 +0200
Subject: [PATCH] Readme

---
 README.md  | 25 ++++++++++++++-----------
 src/ssh.rs |  2 +-
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 17e73ef..8e241ca 100644
--- a/README.md
+++ b/README.md
@@ -74,7 +74,7 @@ Currently only Prefix pathType is supported.
 
 Uses systemd timers to schedule jobs.
 Limited to always running on the same node.
-Haven't looked in to the ForbidConcurrent etc yet. 
+Haven't looked in to the ForbidConcurrent etc yet.
 I 'think' systemd will just spawn a new job if they overlap.
 
 ### Secrets
@@ -82,7 +82,6 @@ I 'think' systemd will just spawn a new job if they overlap.
 Secrets are scheduled to all nodes for simplicity.
 Any references to secrets in a pod manifest are automatically looked up in the same namespace as the pods.
 
-
 ## Registering nodes
 
 ```shell
@@ -138,10 +137,10 @@ sudo apt-get install -y gcc make libssl-dev pkg-config
 ### TODO
 
 - Install
-  - Supported distros/arch
-    - [x] Ubuntu 24.04 amd64/aarch64
-    - [ ] Raspbian armv7
-  - [ ] Idempotent install
+    - Supported distros/arch
+        - [x] Ubuntu 24.04 amd64/aarch64
+        - [ ] Raspbian armv7
+    - [ ] Idempotent install
 
 - Scheduling
     - Strategies
@@ -151,6 +150,7 @@ sudo apt-get install -y gcc make libssl-dev pkg-config
         - [x] Apply
         - [ ] Remove
         - [x] List
+        - [ ] Store manifest in store so CNI plugin can get access
     - Deployments
         - [x] Apply
         - [ ] Remove
@@ -167,8 +167,8 @@ sudo apt-get install -y gcc make libssl-dev pkg-config
         - [x] List
         - [x] Output matches kubectl
         - [ ] Https redirect
-          - [ ] Opt out with annotation: `nginx.ingress.kubernetes.io/ssl-redirect: "false"`
-    -  Cron
+            - [ ] Opt out with annotation: `nginx.ingress.kubernetes.io/ssl-redirect: "false"`
+    - Cron
         - [x] Apply
         - [x] Remove
         - [x] Hash checking
@@ -182,9 +182,9 @@ sudo apt-get install -y gcc make libssl-dev pkg-config
         - [x] List
         - [x] Output matches kubectl
         - [ ] Support private registry secrets
-        - 
+        -
     - ClusterIssuer
-      - For letsencrypt
+        - For letsencrypt
 
 - Networking
     - [x] multi-host container network (currently static routes)
@@ -197,6 +197,9 @@ sudo apt-get install -y gcc make libssl-dev pkg-config
 - Ingress
     - [x] Openresty config template from ingress resources
     - [x] letsencrypt
-      - [ ] Cluster Issuer to set letsencrypt url
+        - [ ] Cluster Issuer to set letsencrypt url
     - [ ] Support gateway api
+- CNI
+    - [ ] Get pod config from store and not sqlite
+    - [ ] Reload nginx 
 
diff --git a/src/ssh.rs b/src/ssh.rs
index 48a2095..841e129 100644
--- a/src/ssh.rs
+++ b/src/ssh.rs
@@ -330,7 +330,7 @@ pub async fn cluster_connections(cluster: &Cluster) -> (Option<SshClients>, Opti
 async fn connect_node(node: &Node) -> Result<SshClient, Box<dyn Error>> {
     let default_key = "";
     let key = node.key.clone().unwrap_or(default_key.to_string());
-    let key = shellexpand::tilde(&key);
+    let key = shellexpand::tilde(&key).to_string();
     let timeout = Duration::from_secs(5);
 
     let auth_method = AuthMethod::with_key_file(&key, None);