From 873d78021e65350385f0cb7391d833ad63436230 Mon Sep 17 00:00:00 2001
From: ItsDrike <itsdrike@protonmail.com>
Date: Thu, 25 Dec 2025 22:52:47 +0100
Subject: [PATCH] Update install_kube script

---
 home/.config/kube/install_kube.py | 74 +++++++++++++++++++++++++++----
 1 file changed, 66 insertions(+), 8 deletions(-)

diff --git a/home/.config/kube/install_kube.py b/home/.config/kube/install_kube.py
index ae573ab..6a3d6d0 100755
--- a/home/.config/kube/install_kube.py
+++ b/home/.config/kube/install_kube.py
@@ -163,6 +163,28 @@ def b64_to_file(target: Path, b64_str: str) -> None:
         _ = fh.write(raw)
 
 
+def load_or_init_kubeconfig(path: Path) -> dict[str, Any]:
+    """Load an existing kubeconfig or initialize a new one.
+
+    Args:
+        path: Path to the kubeconfig file.
+
+    Returns:
+        A valid kubeconfig mapping.
+    """
+    if path.exists():
+        return load_yaml(path)
+
+    return {
+        "apiVersion": "v1",
+        "kind": "Config",
+        "clusters": [],
+        "users": [],
+        "contexts": [],
+        "current-context": "",
+    }
+
+
 def backup_file(path: Path) -> Path:
     """Create a timestamped backup of a file.
 
@@ -209,6 +231,7 @@ def integrate_cluster(
     input_cfg: InputKubeConfig,
     key_root: Path,
     target_name: str | None = None,
+    server_override: str | None = None,
 ) -> None:
     """Integrate a parsed input cluster into an existing kubeconfig.
 
@@ -224,6 +247,10 @@ def integrate_cluster(
 
             If not set, the names from the input config will be used, otherwise,
             this will override those.
+        server_override:
+            Server address of the cluster to be used instead of the one in input_cfg.
+
+            If not set, the server address from input_cfg will be used.
     """
     cluster = input_cfg.cluster
     user = input_cfg.user
@@ -253,11 +280,13 @@ def integrate_cluster(
     if user.spec.client_key_data:
         b64_to_file(cluster_dir / "client.key", user.spec.client_key_data)
 
+    server = server_override if server_override is not None else cluster.spec.server
+
     base_cfg.setdefault("clusters", []).append(
         {
             "name": target_name,
             "cluster": {
-                "server": cluster.spec.server,
+                "server": server,
                 "certificate-authority": str(cluster_dir / "ca.crt"),
             },
         }
@@ -283,8 +312,20 @@ def integrate_cluster(
         }
     )
 
+    if not base_cfg.get("current-context"):
+        base_cfg["current-context"] = target_name
 
-def parse_args() -> argparse.Namespace:
+
+@dataclass(frozen=True, slots=True)
+class Args:
+    input: Path
+    kubeconfig: Path
+    keys: Path
+    name: str | None
+    server: str | None
+
+
+def parse_args() -> Args:
     """Parse command-line arguments."""
     parser = argparse.ArgumentParser(
         description="Merge a single-cluster kubeconfig into ~/.kube/config"
@@ -311,7 +352,22 @@ def parse_args() -> argparse.Namespace:
         type=str,
         help="Override cluster, user and context name when importing",
     )
-    return parser.parse_args()
+    _ = parser.add_argument(
+        "--server",
+        type=str,
+        help=(
+            "Override the cluster API server address "
+            "(useful if the kubeconfig points to localhost)"
+        ),
+    )
+    ns = parser.parse_args()
+    return Args(
+        input=ns.input,
+        kubeconfig=ns.kubeconfig,
+        keys=ns.keys,
+        name=ns.name,
+        server=ns.server,
+    )
 
 
 def main() -> None:
@@ -319,14 +375,16 @@ def main() -> None:
     args = parse_args()
 
     input_yaml = load_yaml(args.input)
-    base_cfg = load_yaml(args.kubeconfig)
-
     input_cfg = InputKubeConfig.from_yaml(input_yaml)
 
-    backup_path = backup_file(args.kubeconfig)
-    print(f"Backup created at {backup_path}")
+    base_cfg = load_or_init_kubeconfig(args.kubeconfig)
 
-    integrate_cluster(base_cfg, input_cfg, args.keys, args.name)
+    if args.kubeconfig.exists():
+        backup_path = backup_file(args.kubeconfig)
+        print(f"Backup created at {backup_path}")
+
+    integrate_cluster(base_cfg, input_cfg, args.keys, args.name, args.server)
+    args.kubeconfig.parent.mkdir(parents=True, exist_ok=True)
     write_yaml(args.kubeconfig, base_cfg)
 
     print("Cluster added successfully.")