rename to get_namespaces_by_type

`get_namespaces_by_prefix` is now renamed to `get_namespaces_by_type` in anticipation of using
labels in the future.

Author: mplsgrant

src/warnet/admin.py

@@ -6,7 +6,7 @@
 from rich import print as richprint
 
 from .constants import NETWORK_DIR, WARGAMES_NAMESPACE_PREFIX
-from .k8s import get_kubeconfig_value, get_namespaces_by_prefix, get_service_accounts_in_namespace
+from .k8s import get_kubeconfig_value, get_namespaces_by_type, get_service_accounts_in_namespace
 from .namespaces import copy_namespaces_defaults, namespaces
 from .network import copy_network_defaults
 from .process import run_command
@@ -67,7 +67,7 @@ def create_kubeconfigs(kubeconfig_dir, token_duration):
     # TODO: choose a prefix convention and have it managed by the helm charts instead of requiring the
     # admin user to pipe through the correct string in multiple places. Another would be to use
     # labels instead of namespace naming conventions
-    warnet_namespaces = get_namespaces_by_prefix(WARGAMES_NAMESPACE_PREFIX)
+    warnet_namespaces = get_namespaces_by_type(WARGAMES_NAMESPACE_PREFIX)
 
     for v1namespace in warnet_namespaces:
         namespace = v1namespace.metadata.name

src/warnet/deploy.py

@@ -25,7 +25,7 @@
 from .k8s import (
     get_default_namespace,
     get_default_namespace_or,
-    get_namespaces_by_prefix,
+    get_namespaces_by_type,
     wait_for_ingress_controller,
     wait_for_pod_ready,
 )
@@ -55,7 +55,7 @@ def validate_directory(ctx, param, value):
 def deploy(directory, debug, namespace, to_all_users):
     """Deploy a warnet with topology loaded from <directory>"""
     if to_all_users:
-        namespaces = get_namespaces_by_prefix(WARGAMES_NAMESPACE_PREFIX)
+        namespaces = get_namespaces_by_type(WARGAMES_NAMESPACE_PREFIX)
         for namespace in namespaces:
             _deploy(directory, debug, namespace.metadata.name, False)
     else:
@@ -67,7 +67,7 @@ def _deploy(directory, debug, namespace, to_all_users):
     directory = Path(directory)
 
     if to_all_users:
-        namespaces = get_namespaces_by_prefix(WARGAMES_NAMESPACE_PREFIX)
+        namespaces = get_namespaces_by_type(WARGAMES_NAMESPACE_PREFIX)
         for namespace in namespaces:
             deploy(directory, debug, namespace.metadata.name, False)
         return

src/warnet/k8s.py

@@ -408,12 +408,12 @@ def get_namespaces() -> list[V1Namespace]:
             return []
 
 
-def get_namespaces_by_prefix(prefix: str) -> list[V1Namespace]:
+def get_namespaces_by_type(namespace_type: str) -> list[V1Namespace]:
     """
     Get all namespaces beginning with `prefix`. Returns empty list of no namespaces with the specified prefix are found.
     """
     namespaces = get_namespaces()
-    return [ns for ns in namespaces if ns.metadata.name.startswith(prefix)]
+    return [ns for ns in namespaces if ns.metadata.name.startswith(namespace_type)]
 
 
 def get_service_accounts_in_namespace(namespace):