feat(#116): add namespace to container list

client/gefyra/__main__.py

@@ -2,6 +2,7 @@
 import argparse
 import logging
 
+from gefyra.api import get_containers_and_print, get_bridges_and_print
 from gefyra.configuration import ClientConfiguration
 from gefyra.local.utils import StoreDictKeyPair
 
@@ -186,26 +187,6 @@ def up_command(args):
     up(config=configuration)
 
 
-def get_containers_and_print():
-    from gefyra.api import list_containers
-
-    containers = list_containers()
-    containers.insert(0, ("NAME", "IP_ADDRESS"))
-    for name, ip in containers:
-        print("{:<30}{}".format(name, ip))
-
-
-def get_bridges_and_print():
-    from gefyra.api import list_interceptrequests
-
-    ireqs = list_interceptrequests()
-    if ireqs:
-        for ireq in ireqs:
-            print(ireq)
-    else:
-        logger.info("No active bridges found")
-
-
 def version(config, check: bool):
     import requests
 
@@ -280,6 +261,9 @@ def main():
                 get_containers_and_print()
             elif args.bridges:
                 get_bridges_and_print()
+            else:
+                get_containers_and_print()
+                get_bridges_and_print()
         elif args.action == "down":
             down()
         elif args.action == "check":

client/gefyra/api/list.py

@@ -1,4 +1,5 @@
 import logging
+from tabulate import tabulate
 from typing import List
 
 from gefyra.configuration import default_configuration
@@ -9,6 +10,28 @@
 logger = logging.getLogger(__name__)
 
 
+def get_containers_and_print():
+    from gefyra.api import list_containers
+
+    containers = list_containers()
+    print(
+        tabulate(
+            containers, headers=["NAME", "IP ADDRESS", "NAMESPACE"], tablefmt="plain"
+        )
+    )
+
+
+def get_bridges_and_print():
+    from gefyra.api import list_interceptrequests
+
+    ireqs = list_interceptrequests()
+    if ireqs:
+        for ireq in ireqs:
+            print(ireq)
+    else:
+        logger.info("No active bridges found")
+
+
 @stopwatch
 def list_interceptrequests(config=default_configuration) -> List[str]:
     from gefyra.local.bridge import get_all_interceptrequests

client/gefyra/local/bridge.py

@@ -64,16 +64,22 @@ def get_all_interceptrequests(config: ClientConfiguration) -> list:
 
 
 def get_all_containers(config: ClientConfiguration) -> list:
-    containers_with_ips = []
+    container_information = []
     gefyra_net = config.DOCKER.networks.get(config.NETWORK_NAME)
-    containers = gefyra_net.attrs.get("Containers")
+    containers = gefyra_net.containers
     # filter out gefyra-cargo container as well as fields other than name and ip
-    for _, entry in containers.items():
-        if entry.get("Name") != "gefyra-cargo":
-            containers_with_ips.append(
-                (entry["Name"], entry["IPv4Address"].split("/")[0])
+    for container in containers:
+        if container.name != "gefyra-cargo":
+            container_information.append(
+                (
+                    container.name,
+                    container.attrs["NetworkSettings"]["Networks"]["gefyra"][
+                        "IPAddress"
+                    ].split("/")[0],
+                    container.attrs["HostConfig"]["DnsSearch"][0].split(".")[0],
+                )
             )
-    return containers_with_ips
+    return container_information
 
 
 def remove_interceptrequest_remainder(config: ClientConfiguration):

client/pyproject.toml

@@ -24,6 +24,7 @@ classifiers = [
 python = "^3.8"
 kubernetes = "^19.15.0"
 docker = "^5.0.3"
+tabulate = "^0.8.10"
 
 [tool.poetry.dev-dependencies]
 flake8-bugbear = "^22.1.11"