Add container selection logic

src/warnet/bitcoin.py

@@ -5,12 +5,11 @@
 from io import BytesIO
 
 import click
-from urllib3.exceptions import MaxRetryError
-
 from test_framework.messages import ser_uint256
 from test_framework.p2p import MESSAGEMAP
+from urllib3.exceptions import MaxRetryError
 
-from .k8s import get_default_namespace, get_mission
+from .k8s import get_default_namespace, get_mission, get_pod
 from .process import run_command
 
 
@@ -39,10 +38,19 @@ def _rpc(tank: str, method: str, params: str):
     # bitcoin-cli should be able to read bitcoin.conf inside the container
     # so no extra args like port, chain, username or password are needed
     namespace = get_default_namespace()
+
+    try:
+        pod = get_pod(tank)
+        container_names = [container.name for container in pod.spec.containers]
+        container_name = container_names[0]
+    except Exception as e:
+        print(f"Could not determine primary container: {e}")
+        return
+
     if params:
-        cmd = f"kubectl -n {namespace} exec {tank} -- bitcoin-cli {method} {' '.join(map(str, params))}"
+        cmd = f"kubectl -n {namespace} exec {tank} --container {container_name} -- bitcoin-cli {method} {' '.join(map(str, params))}"
     else:
-        cmd = f"kubectl -n {namespace} exec {tank} -- bitcoin-cli {method}"
+        cmd = f"kubectl -n {namespace} exec {tank} --container {container_name} -- bitcoin-cli {method}"
     return run_command(cmd)
 
 

src/warnet/control.py

@@ -21,6 +21,7 @@
     delete_pod,
     get_default_namespace,
     get_mission,
+    get_pod,
     get_pods,
     pod_log,
     snapshot_bitcoin_datadir,
@@ -329,9 +330,17 @@ def _logs(pod_name: str, follow: bool):
             return  # cancelled by user
 
     try:
-        stream = pod_log(pod_name, container_name=None, follow=follow)
-        for line in stream.stream():
-            print(line.decode("utf-8"), end=None)
+        pod = get_pod(pod_name)
+        container_names = [container.name for container in pod.spec.containers]
+        container_name = container_names[0]
+    except Exception as e:
+        print(f"Could not determine primary container: {e}")
+        return
+
+    try:
+        stream = pod_log(pod_name, container_name=container_name, follow=follow)
+        for line in stream:
+            click.echo(line.decode("utf-8").rstrip())
     except Exception as e:
         print(e)
     except KeyboardInterrupt:

src/warnet/k8s.py

@@ -4,10 +4,11 @@
 import tempfile
 from pathlib import Path
 from time import sleep
+from typing import Optional
 
 import yaml
 from kubernetes import client, config, watch
-from kubernetes.client.models import CoreV1Event, V1PodList
+from kubernetes.client.models import CoreV1Event, V1Pod, V1PodList
 from kubernetes.client.rest import ApiException
 from kubernetes.dynamic import DynamicClient
 from kubernetes.stream import stream
@@ -41,6 +42,13 @@ def get_pods() -> V1PodList:
     return pod_list
 
 
+def get_pod(name: str, namespace: Optional[str] = None) -> V1Pod:
+    sclient = get_static_client()
+    if not namespace:
+        namespace = get_default_namespace()
+    return sclient.read_namespaced_pod(name=name, namespace=namespace)
+
+
 def get_mission(mission: str) -> list[V1PodList]:
     pods = get_pods()
     crew = []